Commit 0726bca36f7837114041d65b9ca9a6b6b52df055
Committed by
GitHub
GitHub
Merge pull request #491 from mk1990/wvp-28181-2.0
解决设备第一次注册获取不到设备信息和通道信息的问题
Showing
1 changed file
with
4 additions
and
2 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
| @@ -77,13 +77,15 @@ public class DeviceServiceImpl implements IDeviceService { | @@ -77,13 +77,15 @@ public class DeviceServiceImpl implements IDeviceService { | ||
| 77 | if (device.getCreateTime() == null) { | 77 | if (device.getCreateTime() == null) { |
| 78 | device.setCreateTime(now); | 78 | device.setCreateTime(now); |
| 79 | logger.info("[设备上线,首次注册]: {}，查询设备信息以及通道信息", device.getDeviceId()); | 79 | logger.info("[设备上线,首次注册]: {}，查询设备信息以及通道信息", device.getDeviceId()); |
| 80 | + deviceMapper.add(device); | ||
| 81 | + redisCatchStorage.updateDevice(device); | ||
| 80 | commander.deviceInfoQuery(device); | 82 | commander.deviceInfoQuery(device); |
| 81 | sync(device); | 83 | sync(device); |
| 82 | - deviceMapper.add(device); | ||
| 83 | }else { | 84 | }else { |
| 84 | deviceMapper.update(device); | 85 | deviceMapper.update(device); |
| 86 | + redisCatchStorage.updateDevice(device); | ||
| 85 | } | 87 | } |
| 86 | - redisCatchStorage.updateDevice(device); | 88 | + |
| 87 | // 上线添加订阅 | 89 | // 上线添加订阅 |
| 88 | if (device.getSubscribeCycleForCatalog() > 0) { | 90 | if (device.getSubscribeCycleForCatalog() > 0) { |
| 89 | // 查询在线设备那些开启了订阅，为设备开启定时的目录订阅 | 91 | // 查询在线设备那些开启了订阅，为设备开启定时的目录订阅 |