XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复数据错误导致无法转成JSON返回 #919

Browse Source
This commit is contained in:
648540858
2023-07-06 15:35:59 +08:00
parent e163cf4d20
commit e4754af417
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
View File

@@ -493,8 +493,12 @@ public class DeviceServiceImpl implements IDeviceService {
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) {
@@ -525,10 +529,18 @@ public class DeviceServiceImpl implements IDeviceService {
removeMobilePositionSubscribe(deviceInStore);
}
}
// 坐标系变化，需要重新计算GCJ02坐标和WGS84坐标
if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
updateDeviceChannelGeoCoordSys(device);
if (deviceInStore.getGeoCoordSys() != null) {
// 坐标系变化，需要重新计算GCJ02坐标和WGS84坐标
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);