From 6bb8f45e270681dbcb70aed663b406e7d905e091 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 18 四月 2022 15:04:22 +0800
Subject: [PATCH] 优化摄像头注册流程
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 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 8cd2c77..f36b3ae 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
@@ -14,6 +14,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.sip.DialogState;
+
/**
* 璁惧涓氬姟锛堢洰褰曡闃咃級
*/
@@ -39,19 +41,17 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
- if (dynamicTask.contains(device.getDeviceId() + "catalog")) {
- // 瀛樺湪鍒欏仠姝㈢幇鏈夌殑锛屽紑鍚柊鐨�
- dynamicTask.stop(device.getDeviceId() + "catalog");
+ 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);
- catalogSubscribeTask.run();
// 鎻愬墠寮�濮嬪埛鏂拌闃�
- int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
+ int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForCatalog(),30);
// 璁剧疆鏈�灏忓�间负30
- subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
- dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, subscribeCycleForCatalog);
+ dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, subscribeCycleForCatalog -1);
return true;
}
@@ -70,18 +70,16 @@
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 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);
- mobilePositionSubscribeTask.run();
// 鎻愬墠寮�濮嬪埛鏂拌闃�
- int subscribeCycleForCatalog = device.getSubscribeCycleForCatalog();
// 璁剧疆鏈�灏忓�间负30
- subscribeCycleForCatalog = Math.max(subscribeCycleForCatalog, 30);
+ int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForMobilePosition(),30);
dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, subscribeCycleForCatalog -1 );
return true;
}
@@ -102,12 +100,16 @@
}
@Override
- public void setChannelSyncReady(String deviceId) {
- catalogResponseMessageHandler.setChannelSyncReady(deviceId);
- }
-
- @Override
- public void setChannelSyncEnd(String deviceId, String errorMsg) {
- catalogResponseMessageHandler.setChannelSyncEnd(deviceId, errorMsg);
+ public void sync(Device device) {
+ if (catalogResponseMessageHandler.getChannelSyncProgress(device.getDeviceId()) != null) {
+ logger.info("寮�鍚悓姝ユ椂鍙戠幇鍚屾宸茬粡瀛樺湪");
+ return;
+ }
+ int sn = (int)((Math.random()*9+1)*100000);
+ catalogResponseMessageHandler.setChannelSyncReady(device, sn);
+ sipCommander.catalogQuery(device, sn, event -> {
+ String errorMsg = String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg);
+ catalogResponseMessageHandler.setChannelSyncEnd(device.getDeviceId(), errorMsg);
+ });
}
}
--
Gitblit v1.8.0