From 30a313e8a229770ec5c4eef49c6e4f57220deca3 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 19 九月 2020 14:39:49 +0800
Subject: [PATCH] 添加设备通讯状态更新功能

---
 src/com/dev/base/data/Dynamicload_SocketClient_Thread.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/com/dev/base/data/Dynamicload_SocketClient_Thread.java b/src/com/dev/base/data/Dynamicload_SocketClient_Thread.java
index b498912..d02c55e 100644
--- a/src/com/dev/base/data/Dynamicload_SocketClient_Thread.java
+++ b/src/com/dev/base/data/Dynamicload_SocketClient_Thread.java
@@ -44,15 +44,15 @@
 					// *************************** 更新负载按钮信息******************************//*
 
 					// Date t1 = new Date();
-					readElectrical_button(master, dbutton);
-					//readMutilElectrical_button(master, dbutton);
+					//readElectrical_button(master, dbutton);
+					readMutilElectrical_button(master, dbutton);
 					PowerArk_Task_SQL.updateDynamicload_ButtonTable(conn_pool, dbutton);
 					// System.out.println("RT:"+(new Date().getTime() - t1.getTime()));
 
 					// Date t2 = new Date();
 					// **************************** 更新负载状态信息 *****************************//*
-					readElectrical_state(master, dstate);
-					//readMutilElectrical_state(master, dstate);
+					//readElectrical_state(master, dstate);
+					readMutilElectrical_state(master, dstate);
 					PowerArk_Task_SQL.updateDynamicload_StateTable(conn_pool, dstate);
 					// System.out.println("State:"+(new Date().getTime() - t2.getTime()));
 				}
@@ -60,6 +60,7 @@
 				//System.err.println(dinf.dev_id + "=====" + ((new Date()).getTime() - last.getTime()));
 				last = new Date();
 
+				PowerArk_Task_SQL.insertOrUpdateDeviceConnectState(conn_pool, dinf.dev_id, master);
 				if (runCount % 10 == 0) {
 					// 更新当前设备ip
 					master.setTarget_ip(dinf.dev_ip);
@@ -90,7 +91,7 @@
 		BatchRead<Integer> batch = dbutton.createBatchRead(master);	
 		//System.out.println("ip"+dinf.getDev_ip()+"  dbutton: "+batch.toString());
 		BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
-		System.out.println("ip"+dinf.getDev_ip()+"   "+res.toString());
+		//System.out.println("ip"+dinf.getDev_ip()+"   "+res.toString());
 		dbutton.putBatchResult(res);
 	}
 	/**

--
Gitblit v1.9.1