From 5cd2e2c41b6460ea628b158e9f22b6788e99eee1 Mon Sep 17 00:00:00 2001
From: lishuyuan <lishuyuan@inspur.com>
Date: 星期三, 01 十一月 2023 15:17:28 +0800
Subject: [PATCH] bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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
index ba905b5..d932a20 100755
--- 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,12 +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.service.IPlatformService;
-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;
@@ -24,6 +21,9 @@
@Autowired
private DynamicTask dynamicTask;
+ @Autowired
+ private UserSetting userSetting;
+
private final String taskOverduePrefix = "subscribe_overdue_";
private static ConcurrentHashMap<String, SubscribeInfo> catalogMap = new ConcurrentHashMap<>();
@@ -32,11 +32,13 @@
public void putCatalogSubscribe(String platformId, SubscribeInfo subscribeInfo) {
catalogMap.put(platformId, subscribeInfo);
- // 娣诲姞璁㈤槄鍒版湡
- String taskOverdueKey = taskOverduePrefix + "catalog_" + platformId;
- // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
- 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) {
@@ -58,16 +60,18 @@
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(platformId),
subscribeInfo.getGpsInterval() * 1000);
String taskOverdueKey = taskOverduePrefix + "MobilePosition_" + platformId;
- // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
- 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) {
@@ -76,7 +80,7 @@
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;
--
Gitblit v1.8.0