From 124d83fc0c0db5b319b2ae2bdc623890556b932f Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期五, 13 十月 2023 08:55:27 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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..f0e3f23 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
@@ -511,6 +511,13 @@
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) {
@@ -537,6 +544,8 @@
}
}else if (device.getSubscribeCycleForMobilePosition() == 0) {
if (deviceInStore.getSubscribeCycleForMobilePosition() != 0) {
+ deviceInStore.setMobilePositionSubmissionInterval(device.getMobilePositionSubmissionInterval());
+ deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
// 鍙栨秷璁㈤槄
removeMobilePositionSubscribe(deviceInStore);
}
@@ -544,18 +553,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