From 1a5a1cc060e2e4c715d966521d2cdaf2ce239e79 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 10 九月 2020 18:23:32 +0800
Subject: [PATCH] 修改

---
 ElectricalSystem_MonitorServer_2KW/src/com/electrical/TwoKW/Electrical_2KWTask_SQL.java |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ElectricalSystem_MonitorServer_2KW/src/com/electrical/Twokw/Electrical_2KWTask_SQL.java b/ElectricalSystem_MonitorServer_2KW/src/com/electrical/TwoKW/Electrical_2KWTask_SQL.java
similarity index 96%
rename from ElectricalSystem_MonitorServer_2KW/src/com/electrical/Twokw/Electrical_2KWTask_SQL.java
rename to ElectricalSystem_MonitorServer_2KW/src/com/electrical/TwoKW/Electrical_2KWTask_SQL.java
index 39f6572..b7d1bc7 100644
--- a/ElectricalSystem_MonitorServer_2KW/src/com/electrical/Twokw/Electrical_2KWTask_SQL.java
+++ b/ElectricalSystem_MonitorServer_2KW/src/com/electrical/TwoKW/Electrical_2KWTask_SQL.java
@@ -1,4 +1,4 @@
-package com.electrical.Twokw;
+package com.electrical.TwoKW;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -102,12 +102,13 @@
 				"  consvolswitch int(11) NOT NULL DEFAULT '0' COMMENT '恒压切换'," + 
 				"  othermode int(11) NOT NULL DEFAULT '0' COMMENT '4并或2串2并以外模式'," + 
 				"  consvol_distribution int(11) NOT NULL DEFAULT '0' COMMENT '四串恒压电压分配位'," + 
-				"   " + 
-				"  local_remote_control int(11) NOT NULL DEFAULT '0' COMMENT '就地远程控制状态'," + 
+				"  local_remote_control int(11) NOT NULL DEFAULT '0' COMMENT '就地远程控制状态'," +
+				
+				"  pulse_blocking int(11) NOT NULL DEFAULT '0' COMMENT '脉冲封锁'," + 
+				
 				"  curve_charge_mode int(11) NOT NULL DEFAULT '0' COMMENT '曲线充电模式状态'," + 
 				"  start_curve_charge_mode int(11) NOT NULL DEFAULT '0' COMMENT '启动曲线充电模式'," + 
 				"  stop_curve_charge_mode int(11) NOT NULL DEFAULT '0' COMMENT '停止曲线充电模式'," + 
-				"   " + 
 				"  note varchar(255) NOT NULL DEFAULT ''," + 
 				"  PRIMARY KEY (num)," + 
 				"  UNIQUE KEY electric2KW_id_key (electric2KW_id) USING BTREE  " + 
@@ -280,19 +281,12 @@
 				+ " chargecurr_two = "+econ.chargecurr_two+","
 				+ " chargecurr_one = "+econ.chargecurr_one+","
 				+ " currset = "+econ.currset+","
-				+ " localgivecurr = "+econ.localgivecurr+","
 				+ " volset = "+econ.volset+","
-				+ " localgivevol = "+econ.localgivevol+","
-				+ " controlangle = "+econ.controlangle+","
 				+ " stopchargevol_five = "+econ.stopchargevol_five+","
 				+ " stopchargevol_four = "+econ.stopchargevol_four+","
 				+ " stopchargevol_three = "+econ.stopchargevol_three+","
 				+ " stopchargevol_two = "+econ.stopchargevol_two+","
-				+ " stopchargevol_one = "+econ.stopchargevol_one+","
-				+ " alldccurr = "+econ.alldccurr+","
-				+ " alldcvol = "+econ.alldcvol+","
-				+ " brachdccurr = "+econ.brachdccurr+","
-				+ " brachdcvol = "+econ.brachdcvol+" "
+				+ " stopchargevol_one = "+econ.stopchargevol_one+" "
 				+ " WHERE electric2KW_id = " + econ.electric2KW_id;
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
 		try {

--
Gitblit v1.9.1