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

2 写自检 根据 状态 去 判断 是否需要写

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

@@ -177,11 +177,12 @@ public class AgingStageOneProcessJob implements Job {
                         binding.setRecordMinute(String.valueOf(writeCurrentTimeVo.getMinute()));
                         binding.setWriteTimeStatus("1");
                     }
-                }
+
                     // 5. 写入自检让设备开始自检，跟 上面的状态没关系
+                    // 20251231  写自检 根据状态判断
                     int i = Modbus4jUtils.writeSelfCheckStatus(master, deviceId);
                     binding.setWriteSelfCheckStatus(i);
-
+                }
                 // 6. 更新数据库
                 palletDeviceBindingMapper.updatePalletDeviceBinding(binding);
 

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

@@ -191,19 +191,19 @@ public class AgingStageThreeProcessJob implements Job {
                 }
 
                 // 处理 继电器状态，脉冲状态，模组状态，SIM卡状态，网络状态
-                if(result[10] == 1){
+                if(result[10] == 1 && binding.getRelayStatus() == 0){
                     binding.setRelayStatus(1);
                 }
-                if(result[11] == 1){
+                if(result[11] == 1 && binding.getPulseStatus() == 0){
                     binding.setPulseStatus(1);
                 }
-                if(result[12] == 1){
+                if(result[12] == 1 && binding.getModuleStatus() == 0){
                     binding.setModuleStatus(1);
                 }
-                if(result[13] == 1){
+                if(result[13] == 1 && binding.getSimCardStatus() == 0){
                     binding.setSimCardStatus(1);
                 }
-                if(result[14] == 1){
+                if(result[14] == 1 && binding.getNetworkStatus() == 0){
                     binding.setNetworkStatus(1);
                 }
 

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

@@ -200,22 +200,38 @@ public class AgingStageTwoProcessJob  implements Job {
                     errorCount.incrementAndGet();
                     return false;
                 }
-
-                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);
+                if(result[10] == 1) {
+                    binding.setRelayStatus(1);
+                } else {
+                    binding.setRelayStatus(0);
+                }
+                if(result[11] == 1) {
+                    binding.setPulseStatus(1);
+                } else {
+                    binding.setPulseStatus(0);
+                }
+                if(result[12] == 1) {
+                    binding.setModuleStatus(1);
+                } else {
+                    binding.setModuleStatus(0);
+                }
+                if(result[13] == 1) {
+                    binding.setSimCardStatus(1);
+                } else {
+                    binding.setSimCardStatus(0);
+                }
+                if(result[14] == 1) {
+                    binding.setNetworkStatus(1);
+                } else {
+                    binding.setNetworkStatus(0);
+                }
                //  重用之前的master连接进行写操作
                 master = Modbus4jUtils.createModbusMaster(ip, port);
+                // 2025 1231 根据状态去执行自检
+                if(result[1] == 1 || result[1] == 3 || result[1] == 4) {
                     int i = Modbus4jUtils.writeSelfCheckStatus(master, deviceId);
                     binding.setWriteSelfCheckStatus(i);
+                }
 
                 // 5. 更新数据库
                 palletDeviceBindingMapper.updatePalletDeviceBinding(binding);