From 354a39961ad26949f597e4c434b0cd470b7f78ee Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 14 三月 2022 18:24:30 +0800
Subject: [PATCH] 优化点播, 级联点播级联录像。级联列表显示订阅状态

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
index ffac1d0..1cb1128 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
@@ -2,6 +2,7 @@
 
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
+import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
 import com.genersoft.iot.vmp.gb28181.transmit.event.response.SIPResponseProcessorAbstract;
@@ -39,6 +40,9 @@
 
 	@Autowired
 	private SIPProcessorObserver sipProcessorObserver;
+
+	@Autowired
+	private SubscribeHolder subscribeHolder;
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
@@ -83,19 +87,19 @@
 			// 娉ㄥ唽/娉ㄩ攢鎴愬姛
 			logger.info(String.format("%s %s鎴愬姛", platformGBId, action));
 			redisCatchStorage.delPlatformRegisterInfo(callId);
-			parentPlatform.setStatus("娉ㄥ唽".equals(action));
+			redisCatchStorage.delPlatformCatchInfo(platformGBId);
 			// 鍙栧洖Expires璁剧疆锛岄伩鍏嶆敞閿�杩囩▼涓缃负0
-			if (!parentPlatformCatch.getParentPlatform().getExpires().equals("0")) {
-				ParentPlatform parentPlatformTmp = storager.queryParentPlatByServerGBId(platformGBId);
-				String expires = parentPlatformTmp.getExpires();
-				parentPlatform.setExpires(expires);
-				parentPlatform.setId(parentPlatformTmp.getId());
-				redisCatchStorage.updatePlatformRegister(parentPlatform);
-				redisCatchStorage.updatePlatformKeepalive(parentPlatform);
-				parentPlatformCatch.setParentPlatform(parentPlatform);
-				redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
-			}
+			ParentPlatform parentPlatformTmp = storager.queryParentPlatByServerGBId(platformGBId);
+			parentPlatformTmp.setStatus("娉ㄥ唽".equals(action));
+			redisCatchStorage.updatePlatformRegister(parentPlatformTmp);
+			redisCatchStorage.updatePlatformKeepalive(parentPlatformTmp);
+			parentPlatformCatch.setParentPlatform(parentPlatformTmp);
+			redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
 			storager.updateParentPlatformStatus(platformGBId, "娉ㄥ唽".equals(action));
+			if ("娉ㄩ攢".equals(action)) {
+				subscribeHolder.removeCatalogSubscribe(platformGBId);
+				subscribeHolder.removeMobilePositionSubscribe(platformGBId);
+			}
 
 		}
 	}

--
Gitblit v1.8.0