From 1bb0a52614ca77495ebcfbad635d2b8b1fc7745c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期四, 10 九月 2020 16:48:10 +0800
Subject: [PATCH] 修改

---
 ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java b/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
index be07cc0..ae7e7a1 100644
--- a/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
+++ b/ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java
@@ -482,10 +482,11 @@
 			econn.conn_name="CD组合";
 		}
 		String sql_str = " UPDATE "+ Sql_Mysql.Tb_Electric_Control_Conn+" "
-				+ " Set conn_name = "+econn.conn_name+","
+				+ " Set conn_name = '"+econn.conn_name+"',"
 				+ " convolcontrol = "+econn.convolcontrol+","
 				+ " concurrcontrol = "+econn.concurrcontrol+","
 				+ " conn_flag = "+econn.conn_flag+","
+				+ " divide_flag = "+econn.divide_flag+","
 				+ " volset= "+econn.volset+","
 				+ " currset = "+econn.currset+","
 				+ " givevol = "+econn.givevol+","
@@ -654,6 +655,8 @@
 				ecs.setDcvol(res.getFloat("dcvol"));
 				ecs.setDccurr(res.getFloat("dccurr"));
 				ecs.setControlangle(res.getFloat("controlangle"));
+				ecs.setSwitchon(res.getInt("switchon"));
+				ecs.setSwitchoff(res.getInt("switchoff"));
 				//System.out.println(ecs.toString());
 			}
 		} catch (Exception e) {
@@ -769,8 +772,9 @@
 	
 	//更新电源单点控制表
 	public static void update_Electric_Control_Single(MysqlConnPool pool,Electric_Control_Single ecs) {
+		//System.out.println(ecs.toString());
 		String sql_str = " UPDATE "+ Sql_Mysql.Tb_Electric_Control_Single 
-				+ " upsetcurr = "+ecs.upsetcurr+","
+				+ " set upsetcurr = "+ecs.upsetcurr+","
 				+ " upsetvol = "+ecs.upsetvol+","
 				+ " convolcontrol = "+ecs.convolcontrol+","
 				+ " concurrcontrol= "+ecs.concurrcontrol+","
@@ -783,8 +787,11 @@
 				+ " fanstop = "+ecs.fanstop+","
 				+ " dcvol = "+ecs.dcvol+","
 				+ " dccurr = "+ecs.dccurr+","
+				+ " switchon = "+ecs.switchon+","
+				+ " switchoff = "+ecs.switchoff+","
 				+ " controlangle="+ecs.controlangle+" "
 				+ " WHERE electric_id = " + ecs.electric_id;
+		//System.out.println(sql_str);
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
 		try {
 			sql.sqlMysqlExecute(sql_str);

--
Gitblit v1.9.1