From 41616f726dafafe7c015bf4f3e02a7aa9488a3a2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 07 三月 2022 10:47:06 +0800
Subject: [PATCH] 修复导入通道时无平台关联时的bug
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 f914313..675ed4e 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
@@ -30,11 +30,15 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
+ if (dynamicTask.contains(device.getDeviceId())) {
+ logger.info("[娣诲姞鐩綍璁㈤槄] 璁惧{}鐨勭洰褰曡闃呬互瀛樺湪", device.getDeviceId());
+ return false;
+ }
+ logger.info("[娣诲姞鐩綍璁㈤槄] 璁惧{}", device.getDeviceId());
// 娣诲姞鐩綍璁㈤槄
CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander);
catalogSubscribeTask.run();
// 鎻愬墠寮�濮嬪埛鏂拌闃�
- // TODO 浣跨敤jain sip鐨勫綋鏃跺埛鏂拌闃�
int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
// 璁剧疆鏈�灏忓�间负30
subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
@@ -48,7 +52,7 @@
return false;
}
logger.info("绉婚櫎鐩綍璁㈤槄: {}", device.getDeviceId());
- dynamicTask.stopCron(device.getDeviceId());
+ dynamicTask.stop(device.getDeviceId());
device.setSubscribeCycleForCatalog(0);
sipCommander.catalogSubscribe(device, null, null);
return true;
--
Gitblit v1.8.0