20240920

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();
     }
 
 }

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;