From 95c0c2e94d390650d3954c30c6a7c805fe9c714c Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 15 十月 2020 18:23:18 +0800
Subject: [PATCH] 负载添加历史实时数据记录功能
---
src/com/dev/base/data/Dynamicload_SocketClient_Thread.java | 20 +++++++++++++++-----
1 files changed, 15 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 b981940..24cbe4e 100644
--- a/src/com/dev/base/data/Dynamicload_SocketClient_Thread.java
+++ b/src/com/dev/base/data/Dynamicload_SocketClient_Thread.java
@@ -26,9 +26,13 @@
this.conn_pool = conn_pool;
this.dinf = dinf;
- dbutton = new Dynamicload_button(dinf.getDev_id());
- dcontrol = new Dynamicload_control(dinf.getDev_id(),dinf.getFZ_button_num());
- dstate = new Dynamicload_state(dinf.getDev_id(),dinf.getFZ_button_num());
+ dbutton = dinf.button;
+ dcontrol = dinf.control;
+ dstate = dinf.state;
+
+ //dbutton = new Dynamicload_button(dinf.getDev_id());
+ //dcontrol = new Dynamicload_control(dinf.getDev_id(),dinf.getFZ_button_num());
+ //dstate = new Dynamicload_state(dinf.getDev_id(),dinf.getFZ_button_num());
master = new MyModbusMaster(dinf.getDev_ip(), MyModbusMaster.SLAVEID_DEFAULT);
//System.out.println("master: "+master);
}
@@ -47,13 +51,17 @@
PowerArk_Task_SQL.update_Dynamicload_Control(conn_pool, dcontrol);
}*/
//控制页面
- PowerArk_Task_SQL.queryDynamicload_Control(conn_pool, dcontrol);
+ /*PowerArk_Task_SQL.queryDynamicload_Control(conn_pool, dcontrol);
{
+// if(dcontrol.dev_id == 1001) {
+// System.out.println(dcontrol.dev_id+"=="+dcontrol.control_en);
+// }
if(dcontrol.control_en) {
+
writeDynamicload_Control(master, dcontrol);
PowerArk_Task_SQL.update_Dynamicload_Control(conn_pool, dcontrol);
}
- }
+ }*/
if (runCount % 2 == 0) {
// *************************** 更新负载按钮信息******************************//*
@@ -75,6 +83,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);
+ dinf.conn_state = master.getConnectState();
if (runCount % 10 == 0) {
// 更新当前设备ip
master.setTarget_ip(dinf.dev_ip);
@@ -176,6 +185,7 @@
}
}
if(dcontrol.start_auto>0) {
+ //System.out.println("启动自动加减载");
MyModbusUtils.writeCoil(8, true, master);
}
if(dcontrol.stop_auto>0) {
--
Gitblit v1.9.1