Merge pull request #491 from mk1990/wvp-28181-2.0

解决设备第一次注册获取不到设备信息和通道信息的问题
This commit is contained in:
648540858 2022-05-25 14:09:43 +08:00 committed by GitHub
commit f445156f03

View File

@ -77,13 +77,15 @@ public class DeviceServiceImpl implements IDeviceService {
if (device.getCreateTime() == null) { if (device.getCreateTime() == null) {
device.setCreateTime(now); device.setCreateTime(now);
logger.info("[设备上线,首次注册]: {},查询设备信息以及通道信息", device.getDeviceId()); logger.info("[设备上线,首次注册]: {},查询设备信息以及通道信息", device.getDeviceId());
deviceMapper.add(device);
redisCatchStorage.updateDevice(device);
commander.deviceInfoQuery(device); commander.deviceInfoQuery(device);
sync(device); sync(device);
deviceMapper.add(device);
}else { }else {
deviceMapper.update(device); deviceMapper.update(device);
}
redisCatchStorage.updateDevice(device); redisCatchStorage.updateDevice(device);
}
// 上线添加订阅 // 上线添加订阅
if (device.getSubscribeCycleForCatalog() > 0) { if (device.getSubscribeCycleForCatalog() > 0) {
// 查询在线设备那些开启了订阅为设备开启定时的目录订阅 // 查询在线设备那些开启了订阅为设备开启定时的目录订阅