From e46f1ae9150028b794a9519dda7d66bf77a486c2 Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期四, 31 八月 2023 16:51:06 +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 | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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
old mode 100644
new mode 100755
index fe98d06..166b192
--- 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,6 +1,5 @@
package com.genersoft.iot.vmp.service.impl;
-import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
@@ -109,6 +108,7 @@
inviteStreamService.clearInviteInfo(device.getDeviceId());
}
device.setUpdateTime(now);
+ device.setKeepaliveTime(now);
if (device.getKeepaliveIntervalTime() == 0) {
// 榛樿蹇冭烦闂撮殧60
device.setKeepaliveIntervalTime(60);
@@ -183,6 +183,17 @@
// 鍙戦�乺edis娑堟伅
redisCatchStorage.sendDeviceOrChannelStatus(device.getDeviceId(), null, true);
}
+
+//
+// try {
+// cmder.alarmSubscribe(device, 600, "0", "4", "0", "2023-7-27T00:00:00", "2023-7-28T00:00:00");
+// } catch (InvalidArgumentException e) {
+// throw new RuntimeException(e);
+// } catch (SipException e) {
+// throw new RuntimeException(e);
+// } catch (ParseException e) {
+// throw new RuntimeException(e);
+// }
}
@@ -390,8 +401,8 @@
if (device == null) {
return null;
}
- if (ObjectUtils.isEmpty(parentId) || parentId.equals(deviceId)) {
- parentId = null;
+ if (ObjectUtils.isEmpty(parentId) ) {
+ parentId = deviceId;
}
List<DeviceChannel> rootNodes = deviceChannelMapper.getSubChannelsByDeviceId(deviceId, parentId, onlyCatalog);
return transportChannelsToTree(rootNodes, "");
@@ -494,8 +505,12 @@
if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
deviceInStore.setMediaServerId(device.getMediaServerId());
}
- deviceInStore.setSdpIp(device.getSdpIp());
- deviceInStore.setCharset(device.getCharset());
+ if (!ObjectUtils.isEmpty(device.getCharset())) {
+ deviceInStore.setCharset(device.getCharset());
+ }
+ if (!ObjectUtils.isEmpty(device.getSdpIp())) {
+ deviceInStore.setSdpIp(device.getSdpIp());
+ }
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
if (device.getSubscribeCycleForCatalog() > 0) {
@@ -526,10 +541,18 @@
removeMobilePositionSubscribe(deviceInStore);
}
}
- // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
- if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
- updateDeviceChannelGeoCoordSys(device);
+ if (deviceInStore.getGeoCoordSys() != null) {
+ // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
+ if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
+ updateDeviceChannelGeoCoordSys(device);
+ }
+ }else {
+ device.setGeoCoordSys("WGS84");
}
+ if (device.getCharset() == null) {
+ device.setCharset("GB2312");
+ }
+
// 鏇存柊redis
redisCatchStorage.updateDevice(device);
deviceMapper.updateCustom(device);
--
Gitblit v1.8.0