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 19691b9..a0e557b 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 @@ -90,7 +90,7 @@ public class AccessApplicationRunner implements ApplicationRunner { if (CollUtil.isNotEmpty(list)) { try { list.forEach(item->{ - System.out.println(Thread.currentThread().getName() + ": reboot : nDid : " + item.getNdid()); + //System.out.println(Thread.currentThread().getName() + ": reboot : nDid : " + item.getNdid()); //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入 String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode(); if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(),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 d8c166e..1c1b48f 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 @@ -138,7 +138,7 @@ public class AutoAccessTimer implements ApplicationRunner { } private void processSingleDevice(CsEquipmentDeliveryPO item) { - System.out.println(Thread.currentThread().getName() + ": auto : nDid : " + item.getNdid()); + //System.out.println(Thread.currentThread().getName() + ": auto : nDid : " + item.getNdid()); String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode(); if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(), 1)) { log.info("设备 {} 需要手动注册、接入", item.getNdid()); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java index 5c8992d..7b5a526 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java @@ -61,7 +61,7 @@ public interface ICsEquipmentDeliveryService extends IService getOnlineDev(); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java index f0d7b95..a7408d3 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java @@ -128,12 +128,13 @@ public class CsDevModelServiceImpl implements ICsDevModelService { .filter(item -> Objects.equals(item.getDevAccessMethod(),"CLD")) .map(CsEquipmentDeliveryPO::getId) .collect(Collectors.toList()); - devModelRelationFeignClient.updateDataByList(devList,csDevModelPo.getId()); - Object object = redisUtil.getObjectByKey("setId:" + csDevModelPo.getId()); - if (ObjectUtil.isNotNull(object)) { - csLineFeignClient.updateDataByList(devList,csDevModelPo.getId(),object.toString()); + if (ObjectUtil.isNotEmpty(devList)) { + devModelRelationFeignClient.updateDataByList(devList,csDevModelPo.getId()); + Object object = redisUtil.getObjectByKey("setId:" + csDevModelPo.getId()); + if (ObjectUtil.isNotNull(object)) { + csLineFeignClient.updateDataByList(devList,csDevModelPo.getId(),object.toString()); + } } - } } //5.清空模板缓存