1 写自检后 判断下 是否写成功

zhmes-agecal-system/src/main/java/com/zehong/system/domain/PalletDeviceBinding.java

@@ -129,7 +129,7 @@ public class PalletDeviceBinding extends BaseEntity
     /**
      * 实时AD
      */
-    private int realTimeAd;
+    private Integer realTimeAd;
 
     /**
      * 实时状态 0-异常;1-正常
@@ -150,32 +150,32 @@ public class PalletDeviceBinding extends BaseEntity
     /**
      * 写自检状态 空 是没写 0-失败;1-成功
      */
-    private int writeSelfCheckStatus;
+    private Integer writeSelfCheckStatus;
 
     /**
      * 继电器状态 0：初始 1：动作
      */
-    private int relayStatus;
+    private Integer relayStatus;
 
     /**
      * 脉冲状态 0：初始 1：动作
      */
-    private int pulseStatus;
+    private Integer pulseStatus;
 
     /**
      * 模块状态 0：异常 1：正常
      */
-    private int moduleStatus;
+    private Integer moduleStatus;
 
     /**
      * SIM卡状态 0：异常 1：正常
      */
-    private int simCardStatus;
+    private Integer simCardStatus;
 
     /**
      * 网络状态 0：异常 1：正常
      */
-    private int networkStatus;
+    private Integer networkStatus;
 
     public String getStatus() {
         return status;
@@ -353,14 +353,10 @@ public class PalletDeviceBinding extends BaseEntity
         this.runTimeStatus = runTimeStatus;
     }
 
-    public int getRealTimeAd() {
+    public Integer getRealTimeAd() {
         return realTimeAd;
     }
 
-    public void setRealTimeAd(int realTimeAd) {
-        this.realTimeAd = realTimeAd;
-    }
-
     public String getRealTimeStatus() {
         return realTimeStatus;
     }
@@ -401,51 +397,55 @@ public class PalletDeviceBinding extends BaseEntity
         this.calibrationConcentrationStatus = calibrationConcentrationStatus;
     }
 
-    public int getWriteSelfCheckStatus() {
+    public void setRealTimeAd(Integer realTimeAd) {
+        this.realTimeAd = realTimeAd;
+    }
+
+    public Integer getWriteSelfCheckStatus() {
         return writeSelfCheckStatus;
     }
 
-    public void setWriteSelfCheckStatus(int writeSelfCheckStatus) {
+    public void setWriteSelfCheckStatus(Integer writeSelfCheckStatus) {
         this.writeSelfCheckStatus = writeSelfCheckStatus;
     }
 
-    public int getRelayStatus() {
+    public Integer getRelayStatus() {
         return relayStatus;
     }
 
-    public void setRelayStatus(int relayStatus) {
+    public void setRelayStatus(Integer relayStatus) {
         this.relayStatus = relayStatus;
     }
 
-    public int getPulseStatus() {
+    public Integer getPulseStatus() {
         return pulseStatus;
     }
 
-    public void setPulseStatus(int pulseStatus) {
+    public void setPulseStatus(Integer pulseStatus) {
         this.pulseStatus = pulseStatus;
     }
 
-    public int getModuleStatus() {
+    public Integer getModuleStatus() {
         return moduleStatus;
     }
 
-    public void setModuleStatus(int moduleStatus) {
+    public void setModuleStatus(Integer moduleStatus) {
         this.moduleStatus = moduleStatus;
     }
 
-    public int getSimCardStatus() {
+    public Integer getSimCardStatus() {
         return simCardStatus;
     }
 
-    public void setSimCardStatus(int simCardStatus) {
+    public void setSimCardStatus(Integer simCardStatus) {
         this.simCardStatus = simCardStatus;
     }
 
-    public int getNetworkStatus() {
+    public Integer getNetworkStatus() {
         return networkStatus;
     }
 
-    public void setNetworkStatus(int networkStatus) {
+    public void setNetworkStatus(Integer networkStatus) {
         this.networkStatus = networkStatus;
     }
 

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

@@ -1067,13 +1067,14 @@ public class Modbus4jUtils {
         // 20251206 写完时间写自检，写自检就在时间后边写就行，不管时间写不写成功
         try {
             Modbus4jUtils.writeRegister(master, deviceId, 15, (short) 1);
-            Thread.sleep(2000);
-            int[] ints = Modbus4jUtils.readDeviceRegisters(master, deviceId);
-            if (ints[15] == 1) {
-                return 1;
-            } else {
-                return 0;
-            }
+            return 1;
+//            Thread.sleep(2000);
+//            int[] ints = Modbus4jUtils.readDeviceRegisters(master, deviceId);
+//            if (ints[15] == 1) {
+//                return 1;
+//            } else {
+//                return 0;
+//            }
         } catch (Exception e) {
             return 0;
         }

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

@@ -200,11 +200,18 @@ public class AgingStageTwoProcessJob  implements Job {
                     errorCount.incrementAndGet();
                     return false;
                 }
-                binding.setRelayStatus(result[10]);
-                binding.setPulseStatus(result[11]);
-                binding.setModuleStatus(result[12]);
-                binding.setSimCardStatus(result[13]);
-                binding.setNetworkStatus(result[14]);
+
+                int relayStatus = result[10];
+                int pulseStatus = result[11];
+                int moduleStatus = result[12];
+                int simCardStatus = result[13];
+                int networkStatus = result[14];
+
+                binding.setRelayStatus(relayStatus);
+                binding.setPulseStatus(pulseStatus);
+                binding.setModuleStatus(moduleStatus);
+                binding.setSimCardStatus(simCardStatus);
+                binding.setNetworkStatus(networkStatus);
                //  重用之前的master连接进行写操作
                 master = Modbus4jUtils.createModbusMaster(ip, port);
                 int i = Modbus4jUtils.writeSelfCheckStatus(master, deviceId);