From a9264a8bc04335d5d49a39841b039ba5a64d7717 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 一月 2024 16:34:58 +0800
Subject: [PATCH] 修复assist使用https时无法请求的bug
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 83 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 31 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 166b192..e483e16 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
@@ -45,6 +46,7 @@
* 璁惧涓氬姟锛堢洰褰曡闃咃級
*/
@Service
+@DS("master")
public class DeviceServiceImpl implements IDeviceService {
private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
@@ -155,6 +157,19 @@
sync(device);
// TODO 濡傛灉璁惧涓嬬殑閫氶亾绾ц仈鍒颁簡鍏朵粬骞冲彴锛岄偅涔堥渶瑕佸彂閫佷簨浠舵垨鑰卬otify缁欎笂绾у钩鍙�
}
+ // 涓婄嚎娣诲姞璁㈤槄
+ if (device.getSubscribeCycleForCatalog() > 0) {
+ // 鏌ヨ鍦ㄧ嚎璁惧閭ｄ簺寮�鍚簡璁㈤槄锛屼负璁惧寮�鍚畾鏃剁殑鐩綍璁㈤槄
+ addCatalogSubscribe(device);
+ }
+ if (device.getSubscribeCycleForMobilePosition() > 0) {
+ addMobilePositionSubscribe(device);
+ }
+ if (userSetting.getDeviceStatusNotify()) {
+ // 鍙戦�乺edis娑堟伅
+ redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, true);
+ }
+
}else {
if (deviceChannelMapper.queryAllChannels(device.getDeviceId()).size() == 0) {
logger.info("[璁惧涓婄嚎]: {}锛岄�氶亾鏁颁负0,鏌ヨ閫氶亾淇℃伅", device.getDeviceId());
@@ -167,22 +182,10 @@
}
- // 涓婄嚎娣诲姞璁㈤槄
- if (device.getSubscribeCycleForCatalog() > 0) {
- // 鏌ヨ鍦ㄧ嚎璁惧閭ｄ簺寮�鍚簡璁㈤槄锛屼负璁惧寮�鍚畾鏃剁殑鐩綍璁㈤槄
- addCatalogSubscribe(device);
- }
- if (device.getSubscribeCycleForMobilePosition() > 0) {
- addMobilePositionSubscribe(device);
- }
// 鍒锋柊杩囨湡浠诲姟
String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + device.getDeviceId();
// 濡傛灉绗竴娆℃敞鍐岄偅涔堝繀椤诲湪60 * 3鏃堕棿鍐呮敹鍒颁竴涓績璺筹紝鍚﹀垯璁惧绂荤嚎
dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId(), "棣栨娉ㄥ唽鍚庢湭鑳芥敹鍒板績璺�"), device.getKeepaliveIntervalTime() * 1000 * 3);
- if (userSetting.getDeviceStatusNotify()) {
- // 鍙戦�乺edis娑堟伅
- redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, true);
- }
//
// try {
@@ -206,6 +209,13 @@
}
String registerExpireTaskKey = VideoManagerConstants.REGISTER_EXPIRE_TASK_KEY_PREFIX + deviceId;
dynamicTask.stop(registerExpireTaskKey);
+ if (device.isOnLine()) {
+ if (userSetting.getDeviceStatusNotify()) {
+ // 鍙戦�乺edis娑堟伅
+ redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, false);
+ }
+ }
+
device.setOnLine(false);
redisCatchStorage.updateDevice(device);
deviceMapper.update(device);
@@ -223,11 +233,6 @@
// 绉婚櫎璁㈤槄
removeCatalogSubscribe(device);
removeMobilePositionSubscribe(device);
- if (userSetting.getDeviceStatusNotify()) {
- // 鍙戦�乺edis娑堟伅
- redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, false);
- }
-
}
@Override
@@ -274,7 +279,7 @@
// 璁剧疆鏈�灏忓�间负30
int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForMobilePosition(),30);
// 鍒锋柊璁㈤槄
- dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, (subscribeCycleForCatalog) * 1000);
+ dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, subscribeCycleForCatalog * 1000);
return true;
}
@@ -511,18 +516,27 @@
if (!ObjectUtils.isEmpty(device.getSdpIp())) {
deviceInStore.setSdpIp(device.getSdpIp());
}
+ if (!ObjectUtils.isEmpty(device.getPassword())) {
+ deviceInStore.setPassword(device.getPassword());
+ }
+ if (!ObjectUtils.isEmpty(device.getStreamMode())) {
+ deviceInStore.setStreamMode(device.getStreamMode());
+ }
+
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
- if (device.getSubscribeCycleForCatalog() > 0) {
- if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
- deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ if (deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
+ if (device.getSubscribeCycleForCatalog() > 0) {
+ // 鑻ュ凡寮�鍚闃咃紝浣嗚闃呭懆鏈熶笉鍚岋紝鍒欏厛鍙栨秷
+ if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
+ removeCatalogSubscribe(deviceInStore);
+ }
// 寮�鍚闃�
- addCatalogSubscribe(deviceInStore);
- }
- }else if (device.getSubscribeCycleForCatalog() == 0) {
- if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ addCatalogSubscribe(deviceInStore);
+ }else if (device.getSubscribeCycleForCatalog() == 0) {
// 鍙栨秷璁㈤槄
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
removeCatalogSubscribe(deviceInStore);
}
}
@@ -537,6 +551,8 @@
}
}else if (device.getSubscribeCycleForMobilePosition() == 0) {
if (deviceInStore.getSubscribeCycleForMobilePosition() != 0) {
+ deviceInStore.setMobilePositionSubmissionInterval(device.getMobilePositionSubmissionInterval());
+ deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
// 鍙栨秷璁㈤槄
removeMobilePositionSubscribe(deviceInStore);
}
@@ -544,18 +560,23 @@
if (deviceInStore.getGeoCoordSys() != null) {
// 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
- updateDeviceChannelGeoCoordSys(device);
+ deviceInStore.setGeoCoordSys(device.getGeoCoordSys());
+ updateDeviceChannelGeoCoordSys(deviceInStore);
}
}else {
- device.setGeoCoordSys("WGS84");
+ deviceInStore.setGeoCoordSys("WGS84");
}
if (device.getCharset() == null) {
- device.setCharset("GB2312");
+ deviceInStore.setCharset("GB2312");
}
-
+ //SSRC鏍￠獙
+ deviceInStore.setSsrcCheck(device.isSsrcCheck());
+ //浣滀负娑堟伅閫氶亾
+ deviceInStore.setAsMessageChannel(device.isAsMessageChannel());
+
// 鏇存柊redis
- redisCatchStorage.updateDevice(device);
- deviceMapper.updateCustom(device);
+ deviceMapper.updateCustom(deviceInStore);
+ redisCatchStorage.removeDevice(deviceInStore.getDeviceId());
}
@Override
--
Gitblit v1.8.0