From 4b67bcba4138679f4a43178fbdc532902bc2a4dd Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 20 Sep 2024 13:57:04 +0800
Subject: [PATCH] 20240920

---
 src/main/java/com/xujie/sys/common/utils/TaskUtils.java  | 4 ++--
 .../service/impl/ModbusCommunicateServiceImpl.java       | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

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<EquipmentFolderLocation> list = equipmentFolderLocationService.lambdaQuery().eq(EquipmentFolderLocation::getSuffix, "RS232/RS485").list();
+        List<EquipmentFolderLocation> 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;