From 02be4b868dd46e9ba5c3bbcc71e737db74a71759 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期一, 24 八月 2020 14:05:26 +0800
Subject: [PATCH] 修改水冷故障
---
WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
index a55039a..6f4a462 100644
--- a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
+++ b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
@@ -58,7 +58,6 @@
//**************************** 更新水冷系统状态信息 *****************************//*
readWater_state(master,wstate);
Water_Task_SQL.replace_water_state(conn_pool, wstate);
-
}
if(runCount %4 == 0) {
@@ -223,7 +222,7 @@
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129315);listAlarm.add(w);
}
}
- walarm.Watersystem_BranchFlowTmp_Fault = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_BranchFlowTmp_Fault, master), walarm.Watersystem_BranchFlowTmp_Fault);//冷却系统支路流量/温度故障信息
+ walarm.Watersystem_BranchFlowTmp_Fault = (int)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.Watersystem_BranchFlowTmp_Fault, DataType.TWO_BYTE_INT_SIGNED, master), walarm.Watersystem_BranchFlowTmp_Fault);//冷却系统支路流量/温度故障信息
if(walarm.Watersystem_BranchFlowTmp_Fault>0) {
if((walarm.Watersystem_BranchFlowTmp_Fault>>8&1)==1) {
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129400);listAlarm.add(w);
@@ -274,7 +273,7 @@
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129415);listAlarm.add(w);
}
}
- walarm.Watersystem_Pre_Fault = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Pre_Fault, master), walarm.Watersystem_Pre_Fault);//冷却水压力故障
+ walarm.Watersystem_Pre_Fault = (int)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.Watersystem_Pre_Fault, DataType.TWO_BYTE_INT_SIGNED, master), walarm.Watersystem_Pre_Fault);//冷却水压力故障
if(walarm.Watersystem_Pre_Fault>0) {
if((walarm.Watersystem_Pre_Fault>>8&1)==1) {
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129500);listAlarm.add(w);
@@ -325,7 +324,7 @@
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129515);listAlarm.add(w);
}
}
- walarm.Watersystem_Operation_highorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Operation_highorlow, master), walarm.Watersystem_Operation_highorlow);//冷却系统各部件低/高
+ walarm.Watersystem_Operation_highorlow = (int)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.Watersystem_Operation_highorlow, DataType.TWO_BYTE_INT_SIGNED, master), walarm.Watersystem_Operation_highorlow);//冷却系统各部件低/高
if(walarm.Watersystem_Operation_highorlow>0) {
if((walarm.Watersystem_Operation_highorlow>>8&1)==1) {
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129600);listAlarm.add(w);
@@ -376,7 +375,7 @@
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129615);listAlarm.add(w);
}
}
- walarm.Watersystem_Tmp_highorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Tmp_highorlow, master), walarm.Watersystem_Tmp_highorlow);//冷却系统温度高/超高
+ walarm.Watersystem_Tmp_highorlow = (int)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.Watersystem_Tmp_highorlow, DataType.TWO_BYTE_INT_SIGNED, master), walarm.Watersystem_Tmp_highorlow);//冷却系统温度高/超高
if(walarm.Watersystem_Tmp_highorlow>0) {
if((walarm.Watersystem_Tmp_highorlow>>8&1)==1) {
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129700);listAlarm.add(w);
@@ -427,7 +426,7 @@
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129715);listAlarm.add(w);
}
}
- walarm.Watersystem_TmpFlow_highorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_TmpFlow_highorlow,master), walarm.Watersystem_TmpFlow_highorlow);//冷却系统支路温度/流量低/超低
+ walarm.Watersystem_TmpFlow_highorlow = (int)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.Watersystem_TmpFlow_highorlow, DataType.TWO_BYTE_INT_SIGNED, master), walarm.Watersystem_TmpFlow_highorlow);//冷却系统支路温度/流量低/超低
if(walarm.Watersystem_TmpFlow_highorlow>0) {
if((walarm.Watersystem_TmpFlow_highorlow>>8&1)==1) {
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129800);listAlarm.add(w);
@@ -478,7 +477,7 @@
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129815);listAlarm.add(w);
}
}
- walarm.Watersystem_Flow_ighorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Flow_ighorlow,master), walarm.Watersystem_TmpFlow_highorlow);//冷却水部分支路流量低/超低
+ walarm.Watersystem_Flow_ighorlow = (int)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.Watersystem_TmpFlow_highorlow, DataType.TWO_BYTE_INT_SIGNED, master), walarm.Watersystem_TmpFlow_highorlow);//冷却水部分支路流量低/超低
if(walarm.Watersystem_Flow_ighorlow>0) {
if((walarm.Watersystem_Flow_ighorlow>>8&1)==1) {
Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129900);listAlarm.add(w);
--
Gitblit v1.9.1