From 8c99969ac4cd8aed716664b91383dfc19c7a3c3c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期四, 20 八月 2020 14:54:36 +0800
Subject: [PATCH] 修改水冷系统

---
 WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java |  489 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 486 insertions(+), 3 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 c31de83..23c4dc8 100644
--- a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
+++ b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
@@ -1,6 +1,7 @@
 package com.watersystem.monitor;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,7 +18,8 @@
 	public Water_rt wrt;
 	public Water_brach wbrach;
 	public Water_state wstate;
-	
+	public Water_alarm walarm;
+	public List<Water_alarm> listAlarm;
 	public MyModbusMaster master;
 	
 	//public static final int MAX_READALARM_COUNT = 20;		//一次读取告警节点的最大数量
@@ -60,8 +62,8 @@
 				
 				if(runCount %4 == 0) {
 					//*************************** 读取水冷信息故障 ******************************//*
-					/*readElectricalAlarmData(master,eAlarm);
-					Electrical_Task_SQL.inswrtOrUpdateElectrical_alarmTable(conn_pool, listAlarm);*/
+					readWaterAlarmData(master,walarm);
+					Water_Task_SQL.insertOrUpdateWater_alarmTable(conn_pool, listAlarm);
 				}
 				
 				if(runCount%10 == 0) {
@@ -166,6 +168,487 @@
 		wstate.Water_system_function=(Watersystem_All_State>>11&1);
 		
 	}
+	//读取水冷信息故障
+	private void readWaterAlarmData(MyModbusMaster master,Water_alarm walarm) {
+		listAlarm=new ArrayList<Water_alarm>();
+		Water_alarm alarm=new Water_alarm(walarm.water_id);
+		alarm.setAlarm_starttime(new Date());
+		alarm.setAlarm_endtime(new Date());
+		alarm.setAlarm_confirm(0);
+		walarm.Watersystem_Operation_Fault = (int) master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Operation_Fault,  master), walarm.Watersystem_Operation_Fault);	//冷却系统各部件故障信息
+		if(walarm.Watersystem_Operation_Fault>0) {
+			if((walarm.Watersystem_Operation_Fault>>8&1)==1) {
+				alarm.setAlarm_id(129300);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>9&1)==1) {
+				alarm.setAlarm_id(129301);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>10&1)==1) {
+				alarm.setAlarm_id(129302);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>11&1)==1) {
+				alarm.setAlarm_id(129303);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>12&1)==1) {
+				alarm.setAlarm_id(129304);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>13&1)==1) {
+				alarm.setAlarm_id(129305);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>14&1)==1) {
+				alarm.setAlarm_id(129306);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>15&1)==1) {
+				alarm.setAlarm_id(129307);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>0&1)==1) {
+				alarm.setAlarm_id(129308);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>1&1)==1) {
+				alarm.setAlarm_id(129309);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>2&1)==1) {
+				alarm.setAlarm_id(129310);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>3&1)==1) {
+				alarm.setAlarm_id(129311);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>4&1)==1) {
+				alarm.setAlarm_id(129312);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>5&1)==1) {
+				alarm.setAlarm_id(129313);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>6&1)==1) {
+				alarm.setAlarm_id(129314);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_Fault>>7&1)==1) {
+				alarm.setAlarm_id(129315);
+				listAlarm.add(alarm);
+			}
+			
+		}
+		walarm.Watersystem_BranchFlowTmp_Fault = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_BranchFlowTmp_Fault, master), walarm.Watersystem_BranchFlowTmp_Fault);//冷却系统支路流量/温度故障信息				
+		if(walarm.Watersystem_BranchFlowTmp_Fault>0) {
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>8&1)==1) {
+				alarm.setAlarm_id(129400);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>9&1)==1) {
+				alarm.setAlarm_id(129401);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>10&1)==1) {
+				alarm.setAlarm_id(129402);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>11&1)==1) {
+				alarm.setAlarm_id(129403);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>12&1)==1) {
+				alarm.setAlarm_id(129404);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>13&1)==1) {
+				alarm.setAlarm_id(129405);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>14&1)==1) {
+				alarm.setAlarm_id(129406);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>15&1)==1) {
+				alarm.setAlarm_id(129407);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>0&1)==1) {
+				alarm.setAlarm_id(129408);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>1&1)==1) {
+				alarm.setAlarm_id(129409);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>2&1)==1) {
+				alarm.setAlarm_id(129410);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>3&1)==1) {
+				alarm.setAlarm_id(129411);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>4&1)==1) {
+				alarm.setAlarm_id(129412);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>5&1)==1) {
+				alarm.setAlarm_id(129413);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>6&1)==1) {
+				alarm.setAlarm_id(129414);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_BranchFlowTmp_Fault>>7&1)==1) {
+				alarm.setAlarm_id(129415);
+				listAlarm.add(alarm);
+			}
+		}
+		walarm.Watersystem_Pre_Fault = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Pre_Fault, master), walarm.Watersystem_Pre_Fault);//冷却水压力故障
+		if(walarm.Watersystem_Pre_Fault>0) {
+			if((walarm.Watersystem_Pre_Fault>>8&1)==1) {
+				alarm.setAlarm_id(129500);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>9&1)==1) {
+				alarm.setAlarm_id(129501);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>10&1)==1) {
+				alarm.setAlarm_id(129502);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>11&1)==1) {
+				alarm.setAlarm_id(129503);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>12&1)==1) {
+				alarm.setAlarm_id(129504);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>13&1)==1) {
+				alarm.setAlarm_id(129505);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>14&1)==1) {
+				alarm.setAlarm_id(129506);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>15&1)==1) {
+				alarm.setAlarm_id(129507);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>0&1)==1) {
+				alarm.setAlarm_id(129508);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>1&1)==1) {
+				alarm.setAlarm_id(129509);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>2&1)==1) {
+				alarm.setAlarm_id(129510);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>3&1)==1) {
+				alarm.setAlarm_id(129511);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>4&1)==1) {
+				alarm.setAlarm_id(129512);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>5&1)==1) {
+				alarm.setAlarm_id(129513);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>6&1)==1) {
+				alarm.setAlarm_id(129514);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Pre_Fault>>7&1)==1) {
+				alarm.setAlarm_id(129515);
+				listAlarm.add(alarm);
+			}
+		}
+		walarm.Watersystem_Operation_highorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Operation_highorlow, master), walarm.Watersystem_Operation_highorlow);//冷却系统各部件低/高
+		if(walarm.Watersystem_Operation_highorlow>0) {
+			if((walarm.Watersystem_Operation_highorlow>>8&1)==1) {
+				alarm.setAlarm_id(129600);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>9&1)==1) {
+				alarm.setAlarm_id(129601);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>10&1)==1) {
+				alarm.setAlarm_id(129602);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>11&1)==1) {
+				alarm.setAlarm_id(129603);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>12&1)==1) {
+				alarm.setAlarm_id(129604);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>13&1)==1) {
+				alarm.setAlarm_id(129605);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>14&1)==1) {
+				alarm.setAlarm_id(129606);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>15&1)==1) {
+				alarm.setAlarm_id(129607);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>0&1)==1) {
+				alarm.setAlarm_id(129608);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>1&1)==1) {
+				alarm.setAlarm_id(129609);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>2&1)==1) {
+				alarm.setAlarm_id(129610);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>3&1)==1) {
+				alarm.setAlarm_id(129611);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>4&1)==1) {
+				alarm.setAlarm_id(129612);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>5&1)==1) {
+				alarm.setAlarm_id(129613);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>6&1)==1) {
+				alarm.setAlarm_id(129614);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Operation_highorlow>>7&1)==1) {
+				alarm.setAlarm_id(129615);
+				listAlarm.add(alarm);
+			}
+		}
+		walarm.Watersystem_Tmp_highorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Tmp_highorlow, master), walarm.Watersystem_Tmp_highorlow);//冷却系统温度高/超高
+		if(walarm.Watersystem_Tmp_highorlow>0) {
+			if((walarm.Watersystem_Tmp_highorlow>>8&1)==1) {
+				alarm.setAlarm_id(129700);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>9&1)==1) {
+				alarm.setAlarm_id(129701);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>10&1)==1) {
+				alarm.setAlarm_id(129702);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>11&1)==1) {
+				alarm.setAlarm_id(129703);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>12&1)==1) {
+				alarm.setAlarm_id(129704);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>13&1)==1) {
+				alarm.setAlarm_id(129705);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>14&1)==1) {
+				alarm.setAlarm_id(129706);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>15&1)==1) {
+				alarm.setAlarm_id(129707);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>0&1)==1) {
+				alarm.setAlarm_id(129708);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>1&1)==1) {
+				alarm.setAlarm_id(129709);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>2&1)==1) {
+				alarm.setAlarm_id(129710);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>3&1)==1) {
+				alarm.setAlarm_id(129711);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>4&1)==1) {
+				alarm.setAlarm_id(129712);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>5&1)==1) {
+				alarm.setAlarm_id(129713);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>6&1)==1) {
+				alarm.setAlarm_id(129714);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Tmp_highorlow>>7&1)==1) {
+				alarm.setAlarm_id(129715);
+				listAlarm.add(alarm);
+			}
+		}
+		walarm.Watersystem_TmpFlow_highorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_TmpFlow_highorlow,master), walarm.Watersystem_TmpFlow_highorlow);//冷却系统支路温度/流量低/超低
+		if(walarm.Watersystem_TmpFlow_highorlow>0) {
+			if((walarm.Watersystem_TmpFlow_highorlow>>8&1)==1) {
+				alarm.setAlarm_id(129800);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>9&1)==1) {
+				alarm.setAlarm_id(129801);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>10&1)==1) {
+				alarm.setAlarm_id(129802);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>11&1)==1) {
+				alarm.setAlarm_id(129803);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>12&1)==1) {
+				alarm.setAlarm_id(129804);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>13&1)==1) {
+				alarm.setAlarm_id(129805);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>14&1)==1) {
+				alarm.setAlarm_id(129806);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>15&1)==1) {
+				alarm.setAlarm_id(129807);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>0&1)==1) {
+				alarm.setAlarm_id(129808);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>1&1)==1) {
+				alarm.setAlarm_id(129809);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>2&1)==1) {
+				alarm.setAlarm_id(129810);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>3&1)==1) {
+				alarm.setAlarm_id(129811);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>4&1)==1) {
+				alarm.setAlarm_id(129812);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>5&1)==1) {
+				alarm.setAlarm_id(129813);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>6&1)==1) {
+				alarm.setAlarm_id(129814);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_TmpFlow_highorlow>>7&1)==1) {
+				alarm.setAlarm_id(129815);
+				listAlarm.add(alarm);
+			}
+		}
+		walarm.Watersystem_Flow_ighorlow = (int)master.checkNullData(MyModbusUtils.readCoilStatus(Watersystem_ModbusAddress.Watersystem_Flow_ighorlow,master), walarm.Watersystem_TmpFlow_highorlow);//冷却水部分支路流量低/超低
+		if(walarm.Watersystem_Flow_ighorlow>0) {
+			if((walarm.Watersystem_Flow_ighorlow>>8&1)==1) {
+				alarm.setAlarm_id(129900);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>9&1)==1) {
+				alarm.setAlarm_id(129901);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>10&1)==1) {
+				alarm.setAlarm_id(129902);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>11&1)==1) {
+				alarm.setAlarm_id(129903);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>12&1)==1) {
+				alarm.setAlarm_id(129904);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>13&1)==1) {
+				alarm.setAlarm_id(129905);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>14&1)==1) {
+				alarm.setAlarm_id(129906);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>15&1)==1) {
+				alarm.setAlarm_id(129907);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>0&1)==1) {
+				alarm.setAlarm_id(129908);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>1&1)==1) {
+				alarm.setAlarm_id(129909);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>2&1)==1) {
+				alarm.setAlarm_id(129910);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>3&1)==1) {
+				alarm.setAlarm_id(129911);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>4&1)==1) {
+				alarm.setAlarm_id(129912);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>5&1)==1) {
+				alarm.setAlarm_id(129913);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>6&1)==1) {
+				alarm.setAlarm_id(129914);
+				listAlarm.add(alarm);
+			}
+			if((walarm.Watersystem_Flow_ighorlow>>7&1)==1) {
+				alarm.setAlarm_id(129915);
+				listAlarm.add(alarm);
+			}
+		}
+		
+	}
+
+	
 	public static void main(String[] args) {
 		int b=13;
 		String a=Integer.toBinaryString(b>>0&1);

--
Gitblit v1.9.1