From 1eb2db4f400905c3c9ba04e14118975cdf9d184b Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 11 Jun 2026 15:17:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor(access):=20=E4=BC=98=E5=8C=96=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=AE=BF=E9=97=AE=E9=80=BB=E8=BE=91=E5=B9=B6=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E8=B0=83=E8=AF=95=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 AccessApplicationRunner 中的调试打印语句 - 移除 AutoAccessTimer 中的调试打印语句 - 为 CsDevModelServiceImpl 添加非空检查避免空列表操作 - 更新 IDeviceDeliveryService 接口注释说明获取条件为启用且未删除的装置 --- .../njcn/access/runner/AccessApplicationRunner.java | 2 +- .../java/com/njcn/access/runner/AutoAccessTimer.java | 2 +- .../access/service/ICsEquipmentDeliveryService.java | 2 +- .../access/service/impl/CsDevModelServiceImpl.java | 11 ++++++----- 4 files changed, 9 insertions(+), 8 deletions(-) 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.清空模板缓存