From 49bd565d760ea2c8726258e37ddaadf03e2c1980 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 24 九月 2020 21:50:29 +0800
Subject: [PATCH] 电机数据修改成多点读取
---
Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 5e7847b..849c02a 100644
--- a/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
+++ b/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
@@ -59,16 +59,16 @@
Date t2 = new Date();
if(runCount %2 == 0) {
/*************************** 更新加载电机数据 ******************************/
- readLoadMotorSingnal(master,load_state);
- //readMutilLoadMotorSingnal(master,load_state);
+ //readLoadMotorSingnal(master,load_state);
+ readMutilLoadMotorSingnal(master,load_state);
Motor_Task_SQL.updateLoadMotor_State(conn_pool, load_state);
}
if(runCount %3 == 0) {
/**************************** 读取受试电机数据 *****************************/
- readSubjectMotorSingnal(master,subject_state);
- //readMutilSubjectMotorSingnal(master,subject_state);
+ //readSubjectMotorSingnal(master,subject_state);
+ readMutilSubjectMotorSingnal(master,subject_state);
//t2 = new Date();
Motor_Task_SQL.updateSubjectMotor_State(conn_pool, subject_state);
//System.out.println((new Date().getTime()-t2.getTime()));
@@ -77,8 +77,8 @@
if(runCount %5 == 0) {
/*************************** 读取故障状态信息 ******************************/
//Date start = new Date();
- readMotorAlarmData(master,motor);
- //readMutilMotorAlarmData(master,motor);
+ //readMotorAlarmData(master,motor);
+ readMutilMotorAlarmData(master,motor);
//Date end = new Date();
//System.err.println((end.getTime()-start.getTime()));
}
@@ -230,11 +230,17 @@
* @param load_state2
*/
private void readMutilLoadMotorSingnal(MyModbusMaster master2, Load_motor_state load_state2) {
- BatchRead<Integer> batch = load_state2.createBatchRead(master2);
+ //BatchRead<Integer> batch = load_state2.createBatchRead(master2);
+ //BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master2);
+ //load_state2.putBatchResult(res);
+
+ BatchRead<Integer> batch = load_state2.createHeadBatchRead(master2);
BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master2);
- load_state2.putBatchResult(res);
+ load_state2.putHeadBatchResult(res);
-
+ batch = load_state2.createBodyBatchRead(master2);
+ res = MyModbusUtils.readMutilRegisters(batch, master2);
+ load_state2.putBodyBatchResult(res);
}
--
Gitblit v1.9.1