From ba8633e99a27b90c55b47e8f7d6225f1f0efc6bb Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 08 四月 2022 18:09:23 +0800
Subject: [PATCH] 优化地图-添加地图页面以及设备树

---
 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java |   60 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 595f38c..e9f7968 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -4,12 +4,16 @@
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
 import com.genersoft.iot.vmp.service.IDeviceService;
-import com.genersoft.iot.vmp.service.bean.CatalogSubscribeTask;
+import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
+import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+/**
+ * 璁惧涓氬姟锛堢洰褰曡闃咃級
+ */
 @Service
 public class DeviceServiceImpl implements IDeviceService {
 
@@ -17,7 +21,6 @@
 
     @Autowired
     private DynamicTask dynamicTask;
-;
 
     @Autowired
     private ISIPCommander sipCommander;
@@ -27,12 +30,19 @@
         if (device == null || device.getSubscribeCycleForCatalog() < 0) {
             return false;
         }
+        if (dynamicTask.contains(device.getDeviceId() + "catalog")) {
+            // 瀛樺湪鍒欏仠姝㈢幇鏈夌殑锛屽紑鍚柊鐨�
+            dynamicTask.stop(device.getDeviceId() + "catalog");
+        }
+        logger.info("[娣诲姞鐩綍璁㈤槄] 璁惧{}", device.getDeviceId());
         // 娣诲姞鐩綍璁㈤槄
         CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander);
         catalogSubscribeTask.run();
         // 鎻愬墠寮�濮嬪埛鏂拌闃�
-        String cron = getCron(device.getSubscribeCycleForCatalog() - 60);
-        dynamicTask.startCron(device.getDeviceId(), catalogSubscribeTask, cron);
+        int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
+        // 璁剧疆鏈�灏忓�间负30
+        subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
+        dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, subscribeCycleForCatalog);
         return true;
     }
 
@@ -41,21 +51,39 @@
         if (device == null || device.getSubscribeCycleForCatalog() < 0) {
             return false;
         }
-        dynamicTask.stopCron(device.getDeviceId());
+        logger.info("绉婚櫎鐩綍璁㈤槄: {}", device.getDeviceId());
+        dynamicTask.stop(device.getDeviceId() + "catalog");
         return true;
     }
 
-    public String getCron(int time) {
-        if (time <= 59) {
-            return "0/" + time +" * * * * ?";
-        }else if (time <= 60* 59) {
-            int minute = time/(60);
-            return "0 0/" + minute +" * * * ?";
-        }else if (time <= 60* 60* 59) {
-            int hour = time/(60*60);
-            return "0 0 0/" + hour +" * * ?";
-        }else {
-            return "0 0/10 * * * ?";
+    @Override
+    public boolean addMobilePositionSubscribe(Device device) {
+        if (device == null || device.getSubscribeCycleForMobilePosition() < 0) {
+            return false;
         }
+        if (dynamicTask.contains(device.getDeviceId() + "mobile_position")) {
+            // 瀛樺湪鍒欏仠姝㈢幇鏈夌殑锛屽紑鍚柊鐨�
+            dynamicTask.stop(device.getDeviceId() + "mobile_position");
+        }
+        logger.info("[娣诲姞绉诲姩浣嶇疆璁㈤槄] 璁惧{}", device.getDeviceId());
+        // 娣诲姞鐩綍璁㈤槄
+        MobilePositionSubscribeTask mobilePositionSubscribeTask = new MobilePositionSubscribeTask(device, sipCommander);
+        mobilePositionSubscribeTask.run();
+        // 鎻愬墠寮�濮嬪埛鏂拌闃�
+        int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
+        // 璁剧疆鏈�灏忓�间负30
+        subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
+        dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, subscribeCycleForCatalog -1 );
+        return true;
+    }
+
+    @Override
+    public boolean removeMobilePositionSubscribe(Device device) {
+        if (device == null || device.getSubscribeCycleForCatalog() < 0) {
+            return false;
+        }
+        logger.info("绉婚櫎绉诲姩浣嶇疆璁㈤槄: {}", device.getDeviceId());
+        dynamicTask.stop(device.getDeviceId() + "mobile_position");
+        return true;
     }
 }

--
Gitblit v1.8.0