Merge pull request #647 from L120820/wvp-28181-2.0

648540858

2022-10-25 f3454caaf6241c44e82704711a3a1efe264f400f

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

@@ -19,6 +19,7 @@
import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -118,6 +119,7 @@
            }
            sync(device);
        }else {

            if(device.getOnline() == 0){
                device.setOnline(1);
                device.setCreateTime(now);
@@ -132,6 +134,11 @@
                sync(device);
                // TODO 如果设备下的通道级联到了其他平台，那么需要发送事件或者notify给上级平台
            }else {
                if (deviceChannelMapper.queryAllChannels(device.getDeviceId()).size() == 0) {
                    logger.info("[设备上线]: {}，通道数为0,查询通道信息", device.getDeviceId());
                    sync(device);
                }

                deviceMapper.update(device);
                redisCatchStorage.updateDevice(device);
            }
@@ -559,6 +566,9 @@
        if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
            deviceInStore.setMediaServerId(device.getMediaServerId());
        }
        deviceInStore.setSdpIp(device.getSdpIp());
        deviceInStore.setCharset(device.getCharset());
        deviceInStore.setTreeType(device.getTreeType());

        //  目录订阅相关的信息
        if (device.getSubscribeCycleForCatalog() > 0) {
@@ -593,6 +603,8 @@
        if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
            updateDeviceChannelGeoCoordSys(device);
        }
        // 更新redis
        redisCatchStorage.updateDevice(device);
        deviceMapper.updateCustom(device);
    }

@@ -614,4 +626,9 @@
        }
        return result;
    }

    @Override
    public ResourceBaceInfo getOverview() {
        return deviceMapper.getOverview();
    }
}