Merge pull request #999 from a24211317/wvp-28181-2.0

648540858

2023-09-01 cde7f6460a563a4e9b2624b395d9bdfe6f90e14c

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

old mode 100644
new mode 100755
@@ -210,7 +210,7 @@
        redisCatchStorage.updateDevice(device);
        deviceMapper.update(device);
        //进行通道离线
        deviceChannelMapper.offlineByDeviceId(deviceId);
//        deviceChannelMapper.offlineByDeviceId(deviceId);
        // 离线释放所有ssrc
        List<SsrcTransaction> ssrcTransactions = streamSession.getSsrcTransactionForAll(deviceId, null, null, null);
        if (ssrcTransactions != null && ssrcTransactions.size() > 0) {
@@ -544,18 +544,19 @@
        if (deviceInStore.getGeoCoordSys() != null) {
            // 坐标系变化，需要重新计算GCJ02坐标和WGS84坐标
            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");
        }

        // 更新redis
        redisCatchStorage.updateDevice(device);
        deviceMapper.updateCustom(device);
        deviceMapper.updateCustom(deviceInStore);
        redisCatchStorage.removeDevice(deviceInStore.getDeviceId());
    }

    @Override