Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1045 from lunasaw/wvp-dev-0830 

code review
pull/1055/head
648540858 2023-09-01 09:18:26 +08:00 committed by GitHub
parent 9a64be46ba d38ccc257c
commit 393d25f739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,18 +544,19 @@ public class DeviceServiceImpl implements IDeviceService {
if (deviceInStore.getGeoCoordSys() != null) { if (deviceInStore.getGeoCoordSys() != null) {
// 坐标系变化，需要重新计算GCJ02坐标和WGS84坐标 // 坐标系变化，需要重新计算GCJ02坐标和WGS84坐标
if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) { if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
updateDeviceChannelGeoCoordSys(device); deviceInStore.setGeoCoordSys(device.getGeoCoordSys());
updateDeviceChannelGeoCoordSys(deviceInStore);
} }
}else { }else {
device.setGeoCoordSys("WGS84"); deviceInStore.setGeoCoordSys("WGS84");
} }
if (device.getCharset() == null) { if (device.getCharset() == null) {
device.setCharset("GB2312"); deviceInStore.setCharset("GB2312");
} }
// 更新redis // 更新redis
redisCatchStorage.updateDevice(device); deviceMapper.updateCustom(deviceInStore);
deviceMapper.updateCustom(device); redisCatchStorage.removeDevice(deviceInStore.getDeviceId());
} }
@Override @Override