From 2cf7178cb79dc59edede0caeea81b5d262618cca Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 11 六月 2024 10:14:14 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.1'
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 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..a15de22 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,8 @@
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 +20,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 +31,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) {
@@ -50,24 +51,33 @@
Runnable runnable = dynamicTask.get(taskOverdueKey);
if (runnable instanceof ISubscribeTask) {
ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
- subscribeTask.stop();
+ subscribeTask.stop(null);
}
// 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
dynamicTask.stop(taskOverdueKey);
}
- public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo) {
+ public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo, Runnable gpsTask) {
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);
+
+ int cycleForCatalog;
+ if (subscribeInfo.getGpsInterval() <= 0) {
+ cycleForCatalog = 5;
+ }else {
+ cycleForCatalog = subscribeInfo.getGpsInterval();
+ }
+ dynamicTask.startCron(key, gpsTask,
+ cycleForCatalog * 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,14 +86,14 @@
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();
+ subscribeTask.stop(null);
}
// 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
dynamicTask.stop(taskOverdueKey);
@@ -99,6 +109,16 @@
return platforms;
}
+ public List<String> getAllMobilePositionSubscribePlatform() {
+ List<String> platforms = new ArrayList<>();
+ if(!mobilePositionMap.isEmpty()) {
+ for (String key : mobilePositionMap.keySet()) {
+ platforms.add(mobilePositionMap.get(key).getId());
+ }
+ }
+ return platforms;
+ }
+
public void removeAllSubscribe(String platformId) {
removeMobilePositionSubscribe(platformId);
removeCatalogSubscribe(platformId);
--
Gitblit v1.8.0