From e1f3896f2434f829d284161552758e392cb21835 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期四, 10 九月 2020 18:11:15 +0800
Subject: [PATCH] 修改
---
WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java | 7 ++++---
1 files changed, 4 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 d0410a5..4826ef7 100644
--- a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
+++ b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Watersystem_SocketClient_Thread.java
@@ -36,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);
}
@@ -68,8 +69,8 @@
if(runCount %4 == 0) {
//*************************** 读取水冷信息故障 ******************************//*
//readWaterAlarmData(master,walarm);
- readMutilWaterAlarmData(master, walarm);
- Water_Task_SQL.insertOrUpdateWater_alarmTable(conn_pool, listAlarm);
+ //readMutilWaterAlarmData(master, walarm);
+ //Water_Task_SQL.insertOrUpdateWater_alarmTable(conn_pool, listAlarm);
}
if(runCount%10 == 0) {
@@ -541,7 +542,7 @@
* @param dbutton
*/
public void readMutilWater_rt(MyModbusMaster master, Water_rt wrt) {
- BatchRead<Integer> batch = wrt.createBatchRead(master);
+ BatchRead<Integer> batch = wrt.createBatchRead(master);
BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
wrt.putBatchResult(res);
}
--
Gitblit v1.9.1