From 9b58283617d36b1a70c7ec94dc18028f6138d830 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 03 八月 2020 16:52:18 +0800
Subject: [PATCH] 添加告警记录

---
 Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java b/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
index 71ee256..31a248b 100644
--- a/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
+++ b/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
@@ -55,6 +55,11 @@
 					Motor_Task_SQL.updateSubjectMotor_State(conn_pool, subject_state);
 				}
 				
+				if(runCount %4 == 0) {
+					/*************************** 读取故障状态信息 ******************************/
+					readMotorAlarmData(master,motor);
+				}
+				
 				if(runCount%10 == 0) {
 					//更新当前设备ip
 					master.setTarget_ip(motor.motor_ip);
@@ -76,6 +81,17 @@
 	}
 
 	/**
+	 * 	读取设备报警信息
+	 * @param master2
+	 * @param motor2
+	 */
+	private void readMotorAlarmData(MyModbusMaster master2, Motor_inf motor2) {
+		for(int i=0 ; i< motor2.alarms.size();i++) {
+			motor2.alarms.get(i).checkAlarm((int)master2.checkNullData(MyModbusUtils.readCoilStatus(12000+i*4, master2), motor2.alarms.get(i).alarm_state));
+		}
+	}
+
+	/**
 	 * 读取受试电机信息
 	 * @param master2
 	 * @param subject_state2

--
Gitblit v1.9.1