From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java |   60 ++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
old mode 100644
new mode 100755
index f191c00..d932a20
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
@@ -2,10 +2,9 @@
 
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
 import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeHandlerTask;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,6 +12,9 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * @author lin
+ */
 @Component
 public class SubscribeHolder {
 
@@ -20,13 +22,7 @@
     private DynamicTask dynamicTask;
 
     @Autowired
-    private IRedisCatchStorage redisCatchStorage;
-
-    @Autowired
-    private ISIPCommanderForPlatform sipCommanderForPlatform;
-
-    @Autowired
-    private IVideoManagerStorage storager;
+    private UserSetting userSetting;
 
     private final String taskOverduePrefix = "subscribe_overdue_";
 
@@ -36,12 +32,13 @@
 
     public void putCatalogSubscribe(String platformId, SubscribeInfo subscribeInfo) {
         catalogMap.put(platformId, subscribeInfo);
-        // 娣诲姞璁㈤槄鍒版湡
-        String taskOverdueKey = taskOverduePrefix +  "catalog_" + platformId;
-        dynamicTask.stop(taskOverdueKey);
-        // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
-        dynamicTask.startDelay(taskOverdueKey, () -> removeCatalogSubscribe(subscribeInfo.getId()),
-                subscribeInfo.getExpires() * 1000);
+        if (subscribeInfo.getExpires() > 0) {
+            // 娣诲姞璁㈤槄鍒版湡
+            String taskOverdueKey = taskOverduePrefix +  "catalog_" + platformId;
+            // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+            dynamicTask.startDelay(taskOverdueKey, () -> removeCatalogSubscribe(subscribeInfo.getId()),
+                    subscribeInfo.getExpires() * 1000);
+        }
     }
 
     public SubscribeInfo getCatalogSubscribe(String platformId) {
@@ -49,26 +46,32 @@
     }
 
     public void removeCatalogSubscribe(String platformId) {
+
         catalogMap.remove(platformId);
         String taskOverdueKey = taskOverduePrefix +  "catalog_" + platformId;
+        Runnable runnable = dynamicTask.get(taskOverdueKey);
+        if (runnable instanceof ISubscribeTask) {
+            ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+            subscribeTask.stop();
+        }
         // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
         dynamicTask.stop(taskOverdueKey);
     }
 
     public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo) {
         mobilePositionMap.put(platformId, subscribeInfo);
-        String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX +  "MobilePosition_" + platformId;
+        String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "MobilePosition_" + platformId;
         // 娣诲姞浠诲姟澶勭悊GPS瀹氭椂鎺ㄩ��
-        dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(redisCatchStorage, sipCommanderForPlatform,
-                storager,  platformId, subscribeInfo.getSn(), key, this, dynamicTask),
+        dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(platformId),
                 subscribeInfo.getGpsInterval() * 1000);
         String taskOverdueKey = taskOverduePrefix +  "MobilePosition_" + platformId;
-        dynamicTask.stop(taskOverdueKey);
-        // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
-        dynamicTask.startDelay(taskOverdueKey, () -> {
-                    removeMobilePositionSubscribe(subscribeInfo.getId());
-                },
-                subscribeInfo.getExpires() * 1000);
+        if (subscribeInfo.getExpires() > 0) {
+            // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+            dynamicTask.startDelay(taskOverdueKey, () -> {
+                        removeMobilePositionSubscribe(subscribeInfo.getId());
+                    },
+                    subscribeInfo.getExpires() * 1000);
+        }
     }
 
     public SubscribeInfo getMobilePositionSubscribe(String platformId) {
@@ -77,10 +80,15 @@
 
     public void removeMobilePositionSubscribe(String platformId) {
         mobilePositionMap.remove(platformId);
-        String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX +  "MobilePosition_" + platformId;
+        String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "MobilePosition_" + platformId;
         // 缁撴潫浠诲姟澶勭悊GPS瀹氭椂鎺ㄩ��
         dynamicTask.stop(key);
         String taskOverdueKey = taskOverduePrefix +  "MobilePosition_" + platformId;
+        Runnable runnable = dynamicTask.get(taskOverdueKey);
+        if (runnable instanceof ISubscribeTask) {
+            ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+            subscribeTask.stop();
+        }
         // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
         dynamicTask.stop(taskOverdueKey);
     }

--
Gitblit v1.8.0