diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java index 15d7252..9f36611 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java @@ -97,6 +97,9 @@ public class AccessApplicationRunner implements ApplicationRunner { csDeviceService.wlDevRegister(item.getNdid()); } else { String version = csTopicService.getVersion(item.getNdid()); + if (Objects.isNull(version)) { + version = "V1"; + } csDeviceService.devAccessAskTemplate(item.getNdid(),version,1); } redisUtil.saveByKey(AppRedisKey.DEVICE_MID + item.getNdid(),1); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java index 7b2ef2d..ec5dbd7 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java @@ -69,7 +69,7 @@ public class AutoAccessTimer implements ApplicationRunner { for (Future future : futures) { try { future.get(); - } catch (Exception e) { + } catch (InterruptedException | ExecutionException e) { throw new RuntimeException(e); } } @@ -91,6 +91,9 @@ public class AutoAccessTimer implements ApplicationRunner { csDeviceService.wlDevRegister(item.getNdid()); } else { String version = csTopicService.getVersion(item.getNdid()); + if (Objects.isNull(version)) { + version = "V1"; + } csDeviceService.devAccessAskTemplate(item.getNdid(),version,1); } redisUtil.saveByKey(AppRedisKey.DEVICE_MID + item.getNdid(),1); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index 4527629..c71a0e5 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -371,7 +371,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { } @Override - //@Transactional(rollbackFor = Exception.class) + @Transactional(rollbackFor = Exception.class) public String wlDevRegister(String nDid) { String result = "fail"; // 设备状态判断