From f8ef14bfea43abd8716aab15f5e302e7c1f23f79 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 11 六月 2024 10:08:13 +0800
Subject: [PATCH] 修复移动位置位置订阅上报间隔为0的bug
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 78 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 3 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 62a45d5..a15de22
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
@@ -1,13 +1,29 @@
package com.genersoft.iot.vmp.gb28181.bean;
+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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+/**
+ * @author lin
+ */
@Component
public class SubscribeHolder {
+
+ @Autowired
+ private DynamicTask dynamicTask;
+
+ @Autowired
+ private UserSetting userSetting;
+
+ private final String taskOverduePrefix = "subscribe_overdue_";
private static ConcurrentHashMap<String, SubscribeInfo> catalogMap = new ConcurrentHashMap<>();
private static ConcurrentHashMap<String, SubscribeInfo> mobilePositionMap = new ConcurrentHashMap<>();
@@ -15,6 +31,13 @@
public void putCatalogSubscribe(String platformId, SubscribeInfo subscribeInfo) {
catalogMap.put(platformId, subscribeInfo);
+ if (subscribeInfo.getExpires() > 0) {
+ // 娣诲姞璁㈤槄鍒版湡
+ String taskOverdueKey = taskOverduePrefix + "catalog_" + platformId;
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ dynamicTask.startDelay(taskOverdueKey, () -> removeCatalogSubscribe(subscribeInfo.getId()),
+ subscribeInfo.getExpires() * 1000);
+ }
}
public SubscribeInfo getCatalogSubscribe(String platformId) {
@@ -22,11 +45,39 @@
}
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(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 + userSetting.getServerId() + "MobilePosition_" + platformId;
+ // 娣诲姞浠诲姟澶勭悊GPS瀹氭椂鎺ㄩ��
+
+ int cycleForCatalog;
+ if (subscribeInfo.getGpsInterval() <= 0) {
+ cycleForCatalog = 5;
+ }else {
+ cycleForCatalog = subscribeInfo.getGpsInterval();
+ }
+ dynamicTask.startCron(key, gpsTask,
+ cycleForCatalog * 1000);
+ String taskOverdueKey = taskOverduePrefix + "MobilePosition_" + platformId;
+ if (subscribeInfo.getExpires() > 0) {
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ dynamicTask.startDelay(taskOverdueKey, () -> {
+ removeMobilePositionSubscribe(subscribeInfo.getId());
+ },
+ subscribeInfo.getExpires() * 1000);
+ }
}
public SubscribeInfo getMobilePositionSubscribe(String platformId) {
@@ -35,6 +86,17 @@
public void removeMobilePositionSubscribe(String platformId) {
mobilePositionMap.remove(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(null);
+ }
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ dynamicTask.stop(taskOverdueKey);
}
public List<String> getAllCatalogSubscribePlatform() {
@@ -47,8 +109,18 @@
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) {
- mobilePositionMap.remove(platformId);
- catalogMap.remove(platformId);
+ removeMobilePositionSubscribe(platformId);
+ removeCatalogSubscribe(platformId);
}
}
--
Gitblit v1.8.0