From 646419e4ad291258b8c013332bc46aa491176aed Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 28 一月 2022 16:45:12 +0800
Subject: [PATCH] #247
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 33 +++++++++++++++++----------------
1 files changed, 17 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..66407a1 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
@@ -10,6 +10,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+/**
+ * 璁惧涓氬姟锛堢洰褰曡闃咃級
+ */
@Service
public class DeviceServiceImpl implements IDeviceService {
@@ -27,12 +30,19 @@
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();
// 鎻愬墠寮�濮嬪埛鏂拌闃�
- 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(), catalogSubscribeTask, subscribeCycleForCatalog - 5);
return true;
}
@@ -41,21 +51,12 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
+ logger.info("绉婚櫎鐩綍璁㈤槄: {}", device.getDeviceId());
dynamicTask.stopCron(device.getDeviceId());
- return true;
- }
+ device.setSubscribeCycleForCatalog(0);
+ sipCommander.catalogSubscribe(device, null, null);
+ // 娓呯┖cseq璁℃暟
- 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 * * * ?";
- }
+ return true;
}
}
--
Gitblit v1.8.0