1 断电重启项目测试。

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

@@ -188,41 +188,46 @@ public class AgingStageThreeProcessJob implements Job {
                     checkAndUpdateTime(master, deviceId, binding);
                 }
 
-                String readingMode = binding.getReadingMode();
-                // * 1  读继电器不读脉冲  * 2 读脉冲不读继电器 * 3 两个都读
-
-                String plateType = binding.getPlateType();
-
-                // 处理 继电器状态，脉冲状态，模组状态，SIM卡状态，网络状态
-                if(!"2".equals(readingMode)) {
-                    if(result[10] == 1 && binding.getRelayStatus() == 0){
-                        binding.setRelayStatus(1);
-                    }
-                }
-
-                if(!"1".equals(readingMode)) {
-                    if(result[11] == 1 && binding.getPulseStatus() == 0){
-                        binding.setPulseStatus(1);
-                    }
-                }
-
-                if(result[12] == 1 && binding.getModuleStatus() == 0){
-                    binding.setModuleStatus(1);
-                }
-                if(result[13] == 1 && binding.getSimCardStatus() == 0){
-                    binding.setSimCardStatus(1);
-                }
-
-                if("1".equals(plateType)) {
-                    if(result[14] == 1 && binding.getNetworkStatus() == 0){
-                        binding.setNetworkStatus(1);
-                    }
-                }
-
-                if("5".equals(binding.getDeviceStatus())) {
-                    binding.setWriteTimeStatus("0");
-                }
-
+//                String readingMode = binding.getReadingMode();
+//                // * 1  读继电器不读脉冲  * 2 读脉冲不读继电器 * 3 两个都读
+//
+//                String plateType = binding.getPlateType();
+//
+//                // 处理 继电器状态，脉冲状态，模组状态，SIM卡状态，网络状态
+//                if(!"2".equals(readingMode)) {
+//                    if(result[10] == 1 && binding.getRelayStatus() == 0){
+//                        binding.setRelayStatus(1);
+//                    }
+//                }
+//
+//                if(!"1".equals(readingMode)) {
+//                    if(result[11] == 1 && binding.getPulseStatus() == 0){
+//                        binding.setPulseStatus(1);
+//                    }
+//                }
+//
+//                if(result[12] == 1 && binding.getModuleStatus() == 0){
+//                    binding.setModuleStatus(1);
+//                }
+//                if(result[13] == 1 && binding.getSimCardStatus() == 0){
+//                    binding.setSimCardStatus(1);
+//                }
+//
+//                if("1".equals(plateType)) {
+//                    if(result[14] == 1 && binding.getNetworkStatus() == 0){
+//                        binding.setNetworkStatus(1);
+//                    }
+//                }
+//
+//                if("5".equals(binding.getDeviceStatus())) {
+//                    binding.setWriteTimeStatus("0");
+//                }
+
+                binding.setRelayStatus(result[10]);
+                binding.setPulseStatus(result[11]);
+                binding.setModuleStatus(result[12]);
+                binding.setSimCardStatus(result[13]);
+                binding.setNetworkStatus(result[14]);
                 // 5. 更新数据库
                 palletDeviceBindingMapper.updatePalletDeviceBinding(binding);
 

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

@@ -193,48 +193,53 @@ public class AgingStageTwoProcessJob  implements Job {
                 // 2. 读取设备数据
                 int[] result = Modbus4jUtils.readDeviceWithRetry(ip, port, deviceId);
 
-                String readingMode = binding.getReadingMode();
-
-                String plateType = binding.getPlateType();
-                if(StringUtils.isBlank(readingMode)) {
-                    readingMode = "3";
-                }
-
-                // 不是2 的时候才读继电器
-                if(!"2".equals(readingMode)) {
-                    if(result[10] == 1) {
-                        binding.setRelayStatus(1);
-                    } else {
-                        binding.setRelayStatus(0);
-                    }
-                }
-
-                // 不是1 的时候 才 读 脉冲
-                if(!"1".equals(binding.getReadingMode())) {
-                    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("1".equals(plateType)) {
-                    if(result[14] == 1) {
-                        binding.setNetworkStatus(1);
-                    } else {
-                        binding.setNetworkStatus(0);
-                    }
-                }
+//                String readingMode = binding.getReadingMode();
+//
+//                String plateType = binding.getPlateType();
+//                if(StringUtils.isBlank(readingMode)) {
+//                    readingMode = "3";
+//                }
+//
+//                // 不是2 的时候才读继电器
+//                if(!"2".equals(readingMode)) {
+//                    if(result[10] == 1) {
+//                        binding.setRelayStatus(1);
+//                    } else {
+//                        binding.setRelayStatus(0);
+//                    }
+//                }
+                binding.setRelayStatus(result[10]);
+                binding.setPulseStatus(result[11]);
+                binding.setModuleStatus(result[12]);
+                binding.setSimCardStatus(result[13]);
+                binding.setNetworkStatus(result[14]);
+//
+//                // 不是1 的时候 才 读 脉冲
+//                if(!"1".equals(binding.getReadingMode())) {
+//                    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("1".equals(plateType)) {
+//                    if(result[14] == 1) {
+//                        binding.setNetworkStatus(1);
+//                    } else {
+//                        binding.setNetworkStatus(0);
+//                    }
+//                }
 
                //  重用之前的master连接进行写操作
                 master = Modbus4jUtils.createModbusMaster(ip, port);