From 93d69d54768a5536635a9228bcd437b01d86babf Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期一, 18 四月 2022 16:16:49 +0800
Subject: [PATCH] 添加国标级联目录分组分组加快通道传输速度

---
 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java |   10 +---------
 1 files changed, 1 insertions(+), 9 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 6f0d179..f287c5e 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
@@ -41,10 +41,6 @@
         if (device == null || device.getSubscribeCycleForCatalog() < 0) {
             return false;
         }
-        CatalogSubscribeTask task = (CatalogSubscribeTask)dynamicTask.get(device.getDeviceId() + "catalog");
-        if (task != null && task.getDialogState() != null && task.getDialogState().equals(DialogState.CONFIRMED)) { // 宸插瓨鍦ㄤ笉闇�瑕佸啀娆℃坊鍔�
-            return true;
-        }
         logger.info("[娣诲姞鐩綍璁㈤槄] 璁惧{}", device.getDeviceId());
         // 娣诲姞鐩綍璁㈤槄
         CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander);
@@ -71,10 +67,6 @@
             return false;
         }
         logger.info("[娣诲姞绉诲姩浣嶇疆璁㈤槄] 璁惧{}", device.getDeviceId());
-        MobilePositionSubscribeTask task = (MobilePositionSubscribeTask)dynamicTask.get(device.getDeviceId() + "mobile_position");
-        if (task != null &&  task.getDialogState() != null && task.getDialogState().equals(DialogState.CONFIRMED)) { // 宸插瓨鍦ㄤ笉闇�瑕佸啀娆℃坊鍔�
-            return true;
-        }
         // 娣诲姞鐩綍璁㈤槄
         MobilePositionSubscribeTask mobilePositionSubscribeTask = new MobilePositionSubscribeTask(device, sipCommander);
         // 鎻愬墠寮�濮嬪埛鏂拌闃�
@@ -106,7 +98,7 @@
 
     @Override
     public void sync(Device device) {
-        if (catalogResponseMessageHandler.getChannelSyncProgress(device.getDeviceId()) != null) {
+        if (catalogResponseMessageHandler.isSyncRunning(device.getDeviceId())) {
             logger.info("寮�鍚悓姝ユ椂鍙戠幇鍚屾宸茬粡瀛樺湪");
             return;
         }

--
Gitblit v1.8.0