From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 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 a027486..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
@@ -1,11 +1,30 @@
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 com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeHandlerTask;
+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<>();
@@ -13,6 +32,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) {
@@ -20,11 +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 + userSetting.getServerId() + "MobilePosition_" + platformId;
+ // 娣诲姞浠诲姟澶勭悊GPS瀹氭椂鎺ㄩ��
+ dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(platformId),
+ subscribeInfo.getGpsInterval() * 1000);
+ String taskOverdueKey = taskOverduePrefix + "MobilePosition_" + platformId;
+ if (subscribeInfo.getExpires() > 0) {
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ dynamicTask.startDelay(taskOverdueKey, () -> {
+ removeMobilePositionSubscribe(subscribeInfo.getId());
+ },
+ subscribeInfo.getExpires() * 1000);
+ }
}
public SubscribeInfo getMobilePositionSubscribe(String platformId) {
@@ -33,5 +80,31 @@
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();
+ }
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ dynamicTask.stop(taskOverdueKey);
+ }
+
+ public List<String> getAllCatalogSubscribePlatform() {
+ List<String> platforms = new ArrayList<>();
+ if(catalogMap.size() > 0) {
+ for (String key : catalogMap.keySet()) {
+ platforms.add(catalogMap.get(key).getId());
+ }
+ }
+ return platforms;
+ }
+
+ public void removeAllSubscribe(String platformId) {
+ removeMobilePositionSubscribe(platformId);
+ removeCatalogSubscribe(platformId);
}
}
--
Gitblit v1.8.0