From 2127cbeca3c2f2de31b7f70b2841cdb2ee259e1a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 5 Jun 2024 22:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=B6=E5=88=B0=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=8D=E7=BD=AE=E8=AE=A2=E9=98=85=E5=90=8E=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/gb28181/bean/SubscribeHolder.java |  9 +++--
 .../MobilePositionSubscribeHandlerTask.java   | 33 -------------------
 2 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100755 src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeHandlerTask.java

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 6557bbaa..6621276c 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
@@ -4,7 +4,7 @@ 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.service.IPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -24,6 +24,9 @@ public class SubscribeHolder {
     @Autowired
     private UserSetting userSetting;
 
+    @Autowired
+    private IPlatformService platformService;
+
     private final String taskOverduePrefix = "subscribe_overdue_";
 
     private static ConcurrentHashMap<String, SubscribeInfo> catalogMap = new ConcurrentHashMap<>();
@@ -62,7 +65,9 @@ public class SubscribeHolder {
         mobilePositionMap.put(platformId, subscribeInfo);
         String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "MobilePosition_" + platformId;
         // 添加任务处理GPS定时推送
-        dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(platformId),
+        dynamicTask.startCron(key, ()->{
+                    platformService.sendNotifyMobilePosition(platformId);
+                },
                 subscribeInfo.getGpsInterval() * 1000);
         String taskOverdueKey = taskOverduePrefix +  "MobilePosition_" + platformId;
         if (subscribeInfo.getExpires() > 0) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeHandlerTask.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeHandlerTask.java
deleted file mode 100755
index a4512f35..00000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/MobilePositionSubscribeHandlerTask.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.task.impl;
-
-import com.genersoft.iot.vmp.common.CommonCallback;
-import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
-import com.genersoft.iot.vmp.service.IPlatformService;
-import com.genersoft.iot.vmp.utils.SpringBeanFactory;
-
-/**
- * 向已经订阅(移动位置)的上级发送MobilePosition消息
- * @author lin
- */
-public class MobilePositionSubscribeHandlerTask implements ISubscribeTask {
-
-
-    private IPlatformService platformService;
-    private String platformId;
-
-
-    public MobilePositionSubscribeHandlerTask(String platformId) {
-        this.platformService = SpringBeanFactory.getBean("platformServiceImpl");
-        this.platformId = platformId;
-    }
-
-    @Override
-    public void run() {
-        platformService.sendNotifyMobilePosition(this.platformId);
-    }
-
-    @Override
-    public void stop(CommonCallback<Boolean> callback) {
-
-    }
-}