diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java index aad18aff..6c2a6b3f 100644 --- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java +++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java @@ -59,9 +59,9 @@ public class TaskUtils { modbusCommunicateService.getInfoByModbus(); } - @Scheduled(cron = "${task.data.modbusCommunicate}") + @Scheduled(cron = "${task.data.readPerSecond}") public void readPerSecond(){ -// modbusCommunicateService.readPerSecond(); + modbusCommunicateService.readPerSecond(); } } diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java index 3d3eac7b..e6ebc05e 100644 --- a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java @@ -153,7 +153,14 @@ public class ModbusCommunicateServiceImpl implements ModbusCommunicateService { @Override @Transactional public void readPerSecond() { - List list = equipmentFolderLocationService.lambdaQuery().eq(EquipmentFolderLocation::getSuffix, "RS232/RS485").list(); + List list = equipmentFolderLocationService + .lambdaQuery() + .eq(EquipmentFolderLocation::getSuffix, "RS232/RS485") + .and(wrapper -> { + wrapper.isNull(EquipmentFolderLocation::getTransparentFlag) + .or().eq(EquipmentFolderLocation::getTransparentFlag,"N"); + }) + .list(); if (list.isEmpty()){ log.info("没有维护RS232/RS485的设备信息"); return;