From 2b64a566f77f90fe47f62863b7a185b6e1c514b7 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 24 九月 2020 09:49:22 +0800
Subject: [PATCH] 屏蔽打印错误日志

---
 WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java |  433 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 420 insertions(+), 13 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..7ad9d5b 100644
--- a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
+++ b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
@@ -8,6 +8,8 @@
 
 import com.modbus.data.MyModbusMaster;
 import com.modbus.data.MyModbusUtils;
+import com.serotonin.modbus4j.BatchRead;
+import com.serotonin.modbus4j.BatchResults;
 import com.serotonin.modbus4j.code.DataType;
 import com.sql.MysqlConnPool;
 
@@ -34,6 +36,7 @@
 		wbrach = new Water_brach(winf.getWater_id());
 		walarm =new Water_alarm(winf.water_id);
 		master = new MyModbusMaster(winf.getWater_ip(), MyModbusMaster.SLAVEID_DEFAULT);
+		//System.out.println(master);
 	}
 		
 
@@ -48,24 +51,29 @@
 				
 				if(runCount %2 == 0) {
 					//*************************** 更新水冷系统实时信息******************************//*
-					readWater_rt(master,wrt);
+					//readWater_rt(master,wrt);
+					readMutilWater_rt(master, wrt);
 					Water_Task_SQL.replace_water_rt(conn_pool, wrt);
 					
 					//**************************** 更新水冷系统分支实时信息 *****************************//*
-					readWater_brach(master,wbrach);
+					//readWater_brach(master,wbrach);
+					readMutilWater_brach(master, wbrach);
 					Water_Task_SQL.replace_water_brach(conn_pool, wbrach);
 					
 					//**************************** 更新水冷系统状态信息 *****************************//*
-					readWater_state(master,wstate);
+					//readWater_state(master,wstate);
+					readMutilWater_state(master, wstate);
 					Water_Task_SQL.replace_water_state(conn_pool, wstate);
-					
 				}
 				
 				if(runCount %4 == 0) {
 					//*************************** 读取水冷信息故障 ******************************//*
-					readWaterAlarmData(master,walarm);
-					Water_Task_SQL.insertOrUpdateWater_alarmTable(conn_pool, listAlarm);
+					//readWaterAlarmData(master,walarm);
+					//readMutilWaterAlarmData(master, walarm);
+					//Water_Task_SQL.insertOrUpdateWater_alarmTable(conn_pool, listAlarm);
 				}
+				
+				Water_Task_SQL.insertOrUpdateDeviceConnectState(conn_pool, winf.water_id, master);
 				
 				if(runCount%10 == 0) {
 					//更新当前设备ip
@@ -105,7 +113,7 @@
 		wrt.External_tmp = (float)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.External_tmp,DataType.TWO_BYTE_INT_SIGNED, master), wrt.External_tmp);				//'外水温度',	
 		wrt.External_pre = (float)master.checkNullData(MyModbusUtils.readHoldingRegister(Watersystem_ModbusAddress.External_pre, DataType.TWO_BYTE_INT_SIGNED, master), wrt.External_pre);//'外水压力',
 	}
-	 /* 	更新电源实时信息
+	 /* 	更新电源实时分支信息
 	 * @param master
 	 * @param load_state
 	 */
@@ -223,7 +231,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 +282,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 +333,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 +384,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 +435,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 +486,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);
@@ -530,7 +538,406 @@
 			}
 		}
 	}
+	/**
+	 * 多点读取水冷系统实时信息
+	 * @param master
+	 * @param dbutton
+	 */
+	public void readMutilWater_rt(MyModbusMaster master, Water_rt wrt) {
+		BatchRead<Integer> batch = wrt.createBatchRead(master);	
+		BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
+		wrt.putBatchResult(res);
+	}
 	
+	/**
+	 * 更新水冷系统实时状态信息
+	 * @param master
+	 * @param dstate
+	 */
+	public void readMutilWater_state(MyModbusMaster master, Water_state wstate) {
+		BatchRead<Integer> batch = wstate.createBatchRead(master);		
+		BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
+		wstate.putBatchResult(res);
+	}
+	/**
+	 * 更新电源实时分支信息
+	 * @param master
+	 * @param dstate
+	 */
+	public void readMutilWater_brach(MyModbusMaster master, Water_brach wbrach) {
+		BatchRead<Integer> batch = wbrach.createBatchRead(master);		
+		BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
+		wbrach.putBatchResult(res);
+	}
+	/**
+	 * 更新电源实时分支信息
+	 * @param master
+	 * @param dstate
+	 */
+	public void readMutilWaterAlarmData(MyModbusMaster master, Water_alarm walarm) {
+		BatchRead<Integer> batch = walarm.createBatchRead(master);		
+		BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
+		walarm.putBatchResult(res);
+		listAlarm=new ArrayList<Water_alarm>();
+		if(res!=null) {
+			if(walarm.Watersystem_Operation_Fault>0) {
+				if((walarm.Watersystem_Operation_Fault>>8&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129300);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>9&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129301);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>10&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129302);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>11&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129303);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>12&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129304);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>13&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129305);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>14&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129306);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>15&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129307);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>0&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129308);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>1&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129309);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>2&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129310);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>3&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129311);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>4&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129312);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>5&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129313);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>6&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129314);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_Fault>>7&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129315);listAlarm.add(w);
+				}
+			}
+			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);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>9&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129401);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>10&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129402);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>11&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129403);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>12&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129404);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>13&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129405);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>14&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129406);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>15&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129407);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>0&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129408);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>1&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129409);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>2&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129410);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>3&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129411);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>4&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129412);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>5&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129413);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>6&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129414);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_BranchFlowTmp_Fault>>7&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129415);listAlarm.add(w);
+				}
+			}
+			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);
+				}
+				if((walarm.Watersystem_Pre_Fault>>9&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129501);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>10&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129502);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>11&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129503);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>12&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129504);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>13&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129505);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>14&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129506);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>15&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129507);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>0&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129508);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>1&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129509);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>2&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129510);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>3&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129511);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>4&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129512);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>5&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129513);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>6&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129514);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Pre_Fault>>7&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129515);listAlarm.add(w);
+				}
+			}
+			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);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>9&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129601);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>10&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129602);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>11&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129603);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>12&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129604);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>13&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129605);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>14&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129606);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>15&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129607);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>0&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129608);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>1&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129609);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>2&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129610);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>3&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129611);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>4&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129612);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>5&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129613);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>6&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129614);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Operation_highorlow>>7&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129615);listAlarm.add(w);
+				}
+			}
+			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);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>9&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129701);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>10&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129702);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>11&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129703);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>12&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129704);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>13&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129705);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>14&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129706);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>15&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129707);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>0&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129708);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>1&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129708);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>2&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129710);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>3&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129711);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>4&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129712);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>5&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129713);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>6&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129714);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Tmp_highorlow>>7&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129715);listAlarm.add(w);
+				}
+			}
+			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);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>9&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129801);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>10&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129802);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>11&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129803);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>12&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129804);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>13&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129805);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>14&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129806);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>15&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129807);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>0&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129808);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>1&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129809);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>2&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129810);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>3&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129811);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>4&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129812);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>5&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129813);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>6&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129814);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_TmpFlow_highorlow>>7&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129815);listAlarm.add(w);
+				}
+			}
+			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);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>9&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129901);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>10&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129902);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>11&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129903);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>12&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129904);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>13&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129905);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>14&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129906);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>15&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129907);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>0&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129908);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>1&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129909);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>2&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129910);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>3&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129911);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>4&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129912);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>5&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129913);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>6&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129914);listAlarm.add(w);
+				}
+				if((walarm.Watersystem_Flow_ighorlow>>7&1)==1) {
+					Water_alarm w=walarm.createWalarm(walarm.getWater_id(), 129915);listAlarm.add(w);
+				}
+			}
+		}
+	}
 	public static void main(String[] args) {
 		int b=13;
 		String a=Integer.toBinaryString(b>>0&1);

--
Gitblit v1.9.1