From bde0e13682ed75d2e8c0cb8a1fd6a96bb92f1dd8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 14 三月 2022 18:34:25 +0800
Subject: [PATCH] #394

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index e1e7125..4acec14 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -158,20 +158,14 @@
 			String interval = XmlUtil.getText(rootElement, "Interval"); // GPS涓婃姤鏃堕棿闂撮殧
 			dynamicTask.startCron(key, new GPSSubscribeTask(redisCatchStorage, sipCommanderForPlatform, storager,  platformId, sn, key, subscribeHolder), Integer.parseInt(interval));
 			subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
-//			redisCatchStorage.updateSubscribe(key, subscribeInfo);
 		}else if (subscribeInfo.getExpires() == 0) {
 			dynamicTask.stop(key);
-//			redisCatchStorage.delSubscribe(key);
 			subscribeHolder.removeMobilePositionSubscribe(platformId);
 		}
 
 		try {
 			ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
-			Response response = responseXmlAck(evt, resultXml.toString(), parentPlatform);
-			ToHeader toHeader = (ToHeader)response.getHeader(ToHeader.NAME);
-			subscribeInfo.setToTag(toHeader.getTag());
-			redisCatchStorage.updateSubscribe(key, subscribeInfo);
-
+			responseXmlAck(evt, resultXml.toString(), parentPlatform);
 		} catch (SipException e) {
 			e.printStackTrace();
 		} catch (InvalidArgumentException e) {
@@ -211,21 +205,14 @@
 				.append("</Response>\r\n");
 
 		if (subscribeInfo.getExpires() > 0) {
-//			redisCatchStorage.updateSubscribe(key, subscribeInfo);
 			subscribeHolder.putCatalogSubscribe(platformId, subscribeInfo);
 		}else if (subscribeInfo.getExpires() == 0) {
-//			redisCatchStorage.delSubscribe(key);
 			subscribeHolder.removeCatalogSubscribe(platformId);
 		}
 
 		try {
 			ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
-			Response response = responseXmlAck(evt, resultXml.toString(), parentPlatform);
-			ToHeader toHeader = (ToHeader)response.getHeader(ToHeader.NAME);
-			subscribeInfo.setToTag(toHeader.getTag());
-//			redisCatchStorage.updateSubscribe(key, subscribeInfo);
-			subscribeHolder.putCatalogSubscribe(platformId, subscribeInfo);
-
+			responseXmlAck(evt, resultXml.toString(), parentPlatform);
 		} catch (SipException e) {
 			e.printStackTrace();
 		} catch (InvalidArgumentException e) {

--
Gitblit v1.8.0