From f7874e2b19ff231100ea354ad100e7f7b4b6d718 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 05 八月 2020 10:31:17 +0800
Subject: [PATCH] 电机控制修复
---
Motor_MonitorServer/src/com/motor/conn/Motor_Task_SQL.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Motor_MonitorServer/src/com/motor/conn/Motor_Task_SQL.java b/Motor_MonitorServer/src/com/motor/conn/Motor_Task_SQL.java
index 6e168d4..4139a19 100644
--- a/Motor_MonitorServer/src/com/motor/conn/Motor_Task_SQL.java
+++ b/Motor_MonitorServer/src/com/motor/conn/Motor_Task_SQL.java
@@ -255,7 +255,7 @@
public static void updateMotor_Control(MysqlConnPool conn_pool,Motor_control control) {
String sql_str = "UPDATE " + Sql_Mysql.Tb_Motor_control +
" SET load_power = " + control.load_power + "," +
- " sensor_power = " + control.sensor_power + "," +
+ " sensor_torque = " + control.sensor_torque + "," +
" load_torque = " + control.load_torque + "," +
" load_motor_speed_limit=" + control.load_motor_speed_limit + "," +
" load_motor_torque_limit = " + control.load_motor_torque_limit + "," +
@@ -267,6 +267,7 @@
Sql_Mysql sql = new Sql_Mysql(conn_pool.getConn());
try {
+ //System.out.println(sql_str);
sql.sqlMysqlExecute(sql_str);
} catch (SQLException e) {
e.printStackTrace();
@@ -482,16 +483,16 @@
Sql_Mysql sql = new Sql_Mysql(conn_pool.getConn());
try {
res = sql.sqlMysqlQuery(sql_str);
- if(res.next()) {
- control.load_power = res.getFloat("load_power");
- control.sensor_torque = res.getFloat("sensor_torque");
- control.load_torque = res.getFloat("load_torque");
- control.load_motor_speed_limit = res.getFloat("load_motor_speed_limit");
- control.load_motor_torque_limit = res.getFloat("load_motor_torque_limit");
- control.load_step_length= res.getFloat("load_motor_torque_limit");
- control.sensor_power = res.getFloat("sensor_power");
- control.gear_box_power = res.getFloat("gear_box_power");
- control.advance_power = res.getFloat("advance_power");
+ if(res.next()) {
+ control.setLoad_power(res.getFloat("load_power"));
+ control.setSensor_torque(res.getFloat("sensor_torque"));
+ control.setLoad_torque(res.getFloat("load_torque"));
+ control.setLoad_motor_speed_limit(res.getFloat("load_motor_speed_limit"));
+ control.setLoad_motor_torque_limit(res.getFloat("load_motor_torque_limit"));
+ control.setLoad_step_length(res.getFloat("load_step_length"));
+ control.setSensor_power(res.getFloat("sensor_power"));
+ control.setGear_box_power(res.getFloat("gear_box_power"));
+ control.setAdvance_power(res.getFloat("advance_power"));
}
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1