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 9f36611..ef0bb3d 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 @@ -94,7 +94,8 @@ public class AccessApplicationRunner implements ApplicationRunner { //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入 String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode(); if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(),1)) { - csDeviceService.wlDevRegister(item.getNdid()); + //csDeviceService.wlDevRegister(item.getNdid()); + log.info("请先手动注册、接入"); } else { String version = csTopicService.getVersion(item.getNdid()); if (Objects.isNull(version)) { 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 ec5dbd7..9fc5fb8 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 @@ -88,7 +88,8 @@ public class AutoAccessTimer implements ApplicationRunner { //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入 String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode(); if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(),1)) { - csDeviceService.wlDevRegister(item.getNdid()); + //csDeviceService.wlDevRegister(item.getNdid()); + log.info("请先手动注册、接入"); } else { String version = csTopicService.getVersion(item.getNdid()); if (Objects.isNull(version)) { 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 c71a0e5..7c0b2b9 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"; // 设备状态判断