From 21caea526a786809abf3790794b02e76293742cb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期六, 19 九月 2020 09:21:21 +0800
Subject: [PATCH] 修改
---
Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 ee56ec0..67ed7ed 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()));
}
--
Gitblit v1.9.1