1 老化柜界面调整及 五分钟巡检任务调整。

zhmes-agecal-system/src/main/java/com/zehong/system/modbus/util/Modbus4jUtils.java

@@ -405,27 +405,27 @@ public class Modbus4jUtils {
     public static Map<Integer, Object> batchReadAgingCabinetStatus(ModbusMaster master, List<Integer> registerOffsets) throws ModbusInitException, ModbusTransportException, ErrorResponseException {
 
         // 把设备集成到一个交换机上后 这个批量读取 不管用了。。
-//        BatchRead<Integer> batch = new BatchRead<Integer>();
-//        for (Integer registerOffset : registerOffsets) {
-//            batch.addLocator(registerOffset, BaseLocator.inputStatus(1, registerOffset));
-//        }
-//
-//        // 非连续地址也支持
-//        batch.setContiguousRequests(true);
-//
-//        BatchResults<Integer> send = master.send(batch);
-//        Map<Integer, Object> result = new HashMap<>();
-//        for (Integer registerOffset : registerOffsets) {
-//            result.put(registerOffset, send.getValue(registerOffset));
-//        }
-//        return result;
+        BatchRead<Integer> batch = new BatchRead<Integer>();
+        for (Integer registerOffset : registerOffsets) {
+            batch.addLocator(registerOffset, BaseLocator.inputStatus(1, registerOffset));
+        }
 
+        // 非连续地址也支持
+        batch.setContiguousRequests(true);
+
+        BatchResults<Integer> send = master.send(batch);
         Map<Integer, Object> result = new HashMap<>();
         for (Integer registerOffset : registerOffsets) {
-            Boolean aBoolean = Modbus4jUtils.readCoilStatus(master, 1, registerOffset);
-            result.put(registerOffset, aBoolean);
+            result.put(registerOffset, send.getValue(registerOffset));
         }
         return result;
+
+//        Map<Integer, Object> result = new HashMap<>();
+//        for (Integer registerOffset : registerOffsets) {
+//            Boolean aBoolean = Modbus4jUtils.readCoilStatus(master, 1, registerOffset);
+//            result.put(registerOffset, aBoolean);
+//        }
+//        return result;
     }
 
     /**