1 测试巡检任务。

zhmes-agecal-admin/src/main/java/com/zehong/web/controller/equipment/TestTaskController.java

@@ -214,6 +214,7 @@ public class TestTaskController {
                                 modbusDeviceData.getDeviceCode(),
                                 modbusDeviceData.getfPowerOutageIp(),
                                 modbusDeviceData.getfPowerOutagePort(),
+                                registerOffset +1,
                                 registerOffset
                         ));
                         isRun = true;

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/RobotArmCommandServiceImpl.java

@@ -187,6 +187,7 @@ public class RobotArmCommandServiceImpl implements IRobotArmCommandService
                                         equitmentCode,
                                         powerOutageIp,
                                         powerOutagePort,
+                                        registerOffset +1,
                                         registerOffset
                                 ));
                             }

zhmes-agecal-system/src/main/java/com/zehong/system/task/AgingCabinetInspectionAndPowerCheckTask.java

@@ -171,13 +171,15 @@ public class AgingCabinetInspectionAndPowerCheckTask {
                     Integer registerOffset = entry.getKey();
                     Object registerValue = entry.getValue();
                     log.info("registerValue =  " + registerValue);
+                    log.info("true equals  registerValue" + "true".equals(registerValue));
                     if ("true".equals(registerValue)) {
                         eventPublisher.publishEvent(new CheckPowerOnCommandEvent(
                                 this,
                                 modbusDeviceData.getfEquipmentCode(),
                                 modbusDeviceData.getfPowerOutageIp(),
                                 modbusDeviceData.getfPowerOutagePort(),
-                                registerOffset + 1
+                                registerOffset + 1,
+                                registerOffset
                         ));
                         isRun = true;
                         // 要给这个 层 发断电的  指令

zhmes-agecal-system/src/main/java/com/zehong/system/task/AllCommandHandler.java

@@ -44,11 +44,12 @@ public class AllCommandHandler {
 
         String fip = event.getIp();
         int fport = event.getPort();
-        int registerOffset = event.getLayer();
+        int registerOffset = event.getRegisterOffset();
+        int layer = event.getLayer();
 
         String storeyCode = event.getDeviceCode() + "-" + (event.getLayer()+1);
 
-        log.info("需要发送上电指令 - 设备:{} 层:{} ip:{} 端口号:{}", event.getDeviceCode(), event.getLayer(), fip, fport);
+        log.info("需要发送上电指令 - 设备:{} 层:{} ip:{} 端口号:{}", event.getDeviceCode(),layer, fip, fport);
         ModbusMaster master;
         try {
             master = Modbus4jUtils.getMaster(fip, fport);

zhmes-agecal-system/src/main/java/com/zehong/system/task/CheckPowerOnCommandEvent.java

@@ -12,14 +12,17 @@ public class CheckPowerOnCommandEvent extends ApplicationEvent {
     private final String ip;
     private final int port;
     private final int layer;
+
+    private final int registerOffset;
     private final String deviceCode;
 
-    public CheckPowerOnCommandEvent(Object source, String deviceCode, String ip, int port, int layer) {
+    public CheckPowerOnCommandEvent(Object source, String deviceCode, String ip, int port, int layer,int registerOffset) {
         super(source);
         this.deviceCode = deviceCode;
         this.ip = ip;
         this.port = port;
         this.layer = layer;
+        this.registerOffset = registerOffset;
     }
 
     // Getters
@@ -27,4 +30,8 @@ public class CheckPowerOnCommandEvent extends ApplicationEvent {
     public int getPort() { return port; }
     public int getLayer() { return layer; }
     public String getDeviceCode() { return deviceCode; }
+
+    public int getRegisterOffset() {
+        return registerOffset;
+    }
 }