From 6bb8f45e270681dbcb70aed663b406e7d905e091 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 18 四月 2022 15:04:22 +0800
Subject: [PATCH] 优化摄像头注册流程
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 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
index a027486..981fe1e 100644
--- 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,34 @@
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.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;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@Component
public class SubscribeHolder {
+
+ @Autowired
+ private DynamicTask dynamicTask;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private ISIPCommanderForPlatform sipCommanderForPlatform;
+
+ @Autowired
+ private IVideoManagerStorage storager;
+
+ private final String taskOverduePrefix = "subscribe_overdue_";
private static ConcurrentHashMap<String, SubscribeInfo> catalogMap = new ConcurrentHashMap<>();
private static ConcurrentHashMap<String, SubscribeInfo> mobilePositionMap = new ConcurrentHashMap<>();
@@ -13,6 +36,12 @@
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);
}
public SubscribeInfo getCatalogSubscribe(String platformId) {
@@ -21,10 +50,24 @@
public void removeCatalogSubscribe(String platformId) {
catalogMap.remove(platformId);
+ String taskOverdueKey = taskOverduePrefix + "catalog_" + platformId;
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ dynamicTask.stop(taskOverdueKey);
}
public void putMobilePositionSubscribe(String platformId, SubscribeInfo subscribeInfo) {
mobilePositionMap.put(platformId, subscribeInfo);
+ String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + "MobilePosition_" + platformId;
+ // 娣诲姞浠诲姟澶勭悊GPS瀹氭椂鎺ㄩ��
+ dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, subscribeInfo.getSn(), key, this), subscribeInfo.getGpsInterval());
+ String taskOverdueKey = taskOverduePrefix + "MobilePosition_" + platformId;
+ dynamicTask.stop(taskOverdueKey);
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ dynamicTask.startDelay(taskOverdueKey, () -> {
+ System.out.println("璁㈤槄杩囨湡");
+ removeMobilePositionSubscribe(subscribeInfo.getId());
+ },
+ subscribeInfo.getExpires() * 1000);
}
public SubscribeInfo getMobilePositionSubscribe(String platformId) {
@@ -33,5 +76,26 @@
public void removeMobilePositionSubscribe(String platformId) {
mobilePositionMap.remove(platformId);
+ String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + "MobilePosition_" + platformId;
+ // 缁撴潫浠诲姟澶勭悊GPS瀹氭椂鎺ㄩ��
+ dynamicTask.stop(key);
+ String taskOverdueKey = taskOverduePrefix + "MobilePosition_" + platformId;
+ // 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
+ 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