Skip to content

Z
zhmes-agecal
Commit 88cb43a3 authored by wanghao's avatar wanghao
Browse files
Options

1 断电重启项目测试。

parent 59ae1e5e
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 77 deletions
zhmes-agecal-system/src/main/java/com/zehong/system/task/AgingStageThreeProcessJob.java
View file @ 88cb43a3
...@@ -188,41 +188,46 @@ public class AgingStageThreeProcessJob implements Job { ...@@ -188,41 +188,46 @@ public class AgingStageThreeProcessJob implements Job {
checkAndUpdateTime(master, deviceId, binding); checkAndUpdateTime(master, deviceId, binding);
} }
String readingMode = binding.getReadingMode(); // String readingMode = binding.getReadingMode();
// * 1 读继电器不读脉冲 * 2 读脉冲不读继电器 * 3 两个都读 // // * 1 读继电器不读脉冲 * 2 读脉冲不读继电器 * 3 两个都读
//
String plateType = binding.getPlateType(); // String plateType = binding.getPlateType();
//
// 处理 继电器状态，脉冲状态，模组状态，SIM卡状态，网络状态 // // 处理 继电器状态，脉冲状态，模组状态，SIM卡状态，网络状态
if(!"2".equals(readingMode)) { // if(!"2".equals(readingMode)) {
if(result[10] == 1 && binding.getRelayStatus() == 0){ // if(result[10] == 1 && binding.getRelayStatus() == 0){
binding.setRelayStatus(1); // binding.setRelayStatus(1);
} // }
} // }
//
if(!"1".equals(readingMode)) { // if(!"1".equals(readingMode)) {
if(result[11] == 1 && binding.getPulseStatus() == 0){ // if(result[11] == 1 && binding.getPulseStatus() == 0){
binding.setPulseStatus(1); // binding.setPulseStatus(1);
} // }
} // }
//
if(result[12] == 1 && binding.getModuleStatus() == 0){ // if(result[12] == 1 && binding.getModuleStatus() == 0){
binding.setModuleStatus(1); // binding.setModuleStatus(1);
} // }
if(result[13] == 1 && binding.getSimCardStatus() == 0){ // if(result[13] == 1 && binding.getSimCardStatus() == 0){
binding.setSimCardStatus(1); // binding.setSimCardStatus(1);
} // }
//
if("1".equals(plateType)) { // if("1".equals(plateType)) {
if(result[14] == 1 && binding.getNetworkStatus() == 0){ // if(result[14] == 1 && binding.getNetworkStatus() == 0){
binding.setNetworkStatus(1); // binding.setNetworkStatus(1);
} // }
} // }
//
if("5".equals(binding.getDeviceStatus())) { // if("5".equals(binding.getDeviceStatus())) {
binding.setWriteTimeStatus("0"); // binding.setWriteTimeStatus("0");
} // }
binding.setRelayStatus(result[10]);
binding.setPulseStatus(result[11]);
binding.setModuleStatus(result[12]);
binding.setSimCardStatus(result[13]);
binding.setNetworkStatus(result[14]);
// 5. 更新数据库 // 5. 更新数据库
palletDeviceBindingMapper.updatePalletDeviceBinding(binding); palletDeviceBindingMapper.updatePalletDeviceBinding(binding);
......
zhmes-agecal-system/src/main/java/com/zehong/system/task/AgingStageTwoProcessJob.java
View file @ 88cb43a3
...@@ -193,48 +193,53 @@ public class AgingStageTwoProcessJob implements Job { ...@@ -193,48 +193,53 @@ public class AgingStageTwoProcessJob implements Job {
// 2. 读取设备数据 // 2. 读取设备数据
int[] result = Modbus4jUtils.readDeviceWithRetry(ip, port, deviceId); int[] result = Modbus4jUtils.readDeviceWithRetry(ip, port, deviceId);
String readingMode = binding.getReadingMode(); // String readingMode = binding.getReadingMode();
//
String plateType = binding.getPlateType(); // String plateType = binding.getPlateType();
if(StringUtils.isBlank(readingMode)) { // if(StringUtils.isBlank(readingMode)) {
readingMode = "3"; // readingMode = "3";
} // }
//
// 不是2 的时候才读继电器 // // 不是2 的时候才读继电器
if(!"2".equals(readingMode)) { // if(!"2".equals(readingMode)) {
if(result[10] == 1) { // if(result[10] == 1) {
binding.setRelayStatus(1); // binding.setRelayStatus(1);
} else { // } else {
binding.setRelayStatus(0); // binding.setRelayStatus(0);
} // }
} // }
binding.setRelayStatus(result[10]);
// 不是1 的时候 才 读 脉冲 binding.setPulseStatus(result[11]);
if(!"1".equals(binding.getReadingMode())) { binding.setModuleStatus(result[12]);
if(result[11] == 1) { binding.setSimCardStatus(result[13]);
binding.setPulseStatus(1); binding.setNetworkStatus(result[14]);
} else { //
binding.setPulseStatus(0); // // 不是1 的时候 才 读 脉冲
} // if(!"1".equals(binding.getReadingMode())) {
} // if(result[11] == 1) {
if(result[12] == 1) { // binding.setPulseStatus(1);
binding.setModuleStatus(1); // } else {
} else { // binding.setPulseStatus(0);
binding.setModuleStatus(0); // }
} // }
if(result[13] == 1) { // if(result[12] == 1) {
binding.setSimCardStatus(1); // binding.setModuleStatus(1);
} else { // } else {
binding.setSimCardStatus(0); // binding.setModuleStatus(0);
} // }
// if(result[13] == 1) {
if("1".equals(plateType)) { // binding.setSimCardStatus(1);
if(result[14] == 1) { // } else {
binding.setNetworkStatus(1); // binding.setSimCardStatus(0);
} else { // }
binding.setNetworkStatus(0); //
} // if("1".equals(plateType)) {
} // if(result[14] == 1) {
// binding.setNetworkStatus(1);
// } else {
// binding.setNetworkStatus(0);
// }
// }
// 重用之前的master连接进行写操作 // 重用之前的master连接进行写操作
master = Modbus4jUtils.createModbusMaster(ip, port); master = Modbus4jUtils.createModbusMaster(ip, port);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment