From 11d40d3e220a3f12453136fedbbdc99f93c6c1b1 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 15 三月 2022 10:47:07 +0800 Subject: [PATCH] #396 --- src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 0d691ce..0fc6f4c 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())) { + // 瀛樺湪鍒欏仠姝㈢幇鏈夌殑锛屽紑鍚柊鐨� + dynamicTask.stop(device.getDeviceId()); + } + 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); @@ -47,8 +51,8 @@ if (device == null || device.getSubscribeCycleForCatalog() < 0) { return false; } - logger.info("绉婚櫎鐩綍璁㈤槄銆恵}銆�", device.getDeviceId()); - dynamicTask.stopCron(device.getDeviceId()); + logger.info("绉婚櫎鐩綍璁㈤槄: {}", device.getDeviceId()); + dynamicTask.stop(device.getDeviceId()); device.setSubscribeCycleForCatalog(0); sipCommander.catalogSubscribe(device, null, null); return true; -- Gitblit v1.8.0