From 619a86e0ed6cdda88e2458b9ec4302d202d2215f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 六月 2024 19:59:48 +0800
Subject: [PATCH] 修复循环引用
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 9 ++-------
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 4 +++-
2 files changed, 5 insertions(+), 8 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 6621276..8c00c49 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
@@ -24,9 +24,6 @@
@Autowired
private UserSetting userSetting;
- @Autowired
- private IPlatformService platformService;
-
private final String taskOverduePrefix = "subscribe_overdue_";
private static ConcurrentHashMap<String, SubscribeInfo> catalogMap = new ConcurrentHashMap<>();
@@ -61,13 +58,11 @@
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瀹氭椂鎺ㄩ��
- dynamicTask.startCron(key, ()->{
- platformService.sendNotifyMobilePosition(platformId);
- },
+ dynamicTask.startCron(key, gpsTask,
subscribeInfo.getGpsInterval() * 1000);
String taskOverdueKey = taskOverduePrefix + "MobilePosition_" + platformId;
if (subscribeInfo.getExpires() > 0) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index 1580baf..c392a12 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -147,7 +147,9 @@
subscribeHolder.removeMobilePositionSubscribe(platformId);
}else {
subscribeInfo.setResponse(response);
- subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+ subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo, ()->{
+ platformService.sendNotifyMobilePosition(platformId);
+ });
}
} catch (SipException | InvalidArgumentException | ParseException e) {
--
Gitblit v1.8.0