From c0c0a4823617af4c7b81bb7cbcb48c7d503ab2e9 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 30 九月 2020 14:11:49 +0800
Subject: [PATCH] 添加历史数据历史数据循环删除功能

---
 ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 8b0349f..05dc7a3 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
@@ -351,6 +351,7 @@
 				"  startposition int(11) NOT NULL DEFAULT '0' COMMENT '启动位'," + 
 				"  stopposition int(11) NOT NULL DEFAULT '0' COMMENT '停止位'," + 
 				"  resetposition int(11) NOT NULL DEFAULT '0' COMMENT '复位'," + 
+				"  screen_reset int(11) NOT NULL DEFAULT '0' COMMENT '触摸屏复位/上位机复位'," + 
 				"  fanstart int(11) NOT NULL DEFAULT '0' COMMENT '风机启动'," + 
 				"  fanstop int(11) NOT NULL DEFAULT '0' COMMENT '风机停止'," + 
 				"  dcvol float NOT NULL DEFAULT '0' COMMENT '直流电压'," + 
@@ -362,8 +363,18 @@
 				"  UNIQUE KEY electric_id_key (electric_id) USING BTREE " + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8;";
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+		ResultSet res = null;
 		try {
 			sql.sqlMysqlExecute(sql_str);
+			//添加触摸屏复位/上位机复位字段screen_reset
+			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+					+ " WHERE table_schema='db_electricsystem'"
+					+ " AND table_name='tb_electric_control_single'"
+					+ " AND column_name='screen_reset'");
+			if(false == res.next()) {
+				sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Control_Single 
+						+ " ADD COLUMN screen_reset int(11) NOT NULL DEFAULT '0' COMMENT '触摸屏复位/上位机复位'  after resetposition;");
+			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} finally {
@@ -646,6 +657,7 @@
 				ecs.setUpsetvol(res.getFloat("upsetvol"));
 				ecs.setConvolcontrol(res.getInt("convolcontrol"));
 				ecs.setConcurrcontrol(res.getInt("concurrcontrol"));
+				ecs.setScreen_reset(res.getInt("screen_reset"));
 				//ecs.setOthermodes(res.getInt("othermodes"));
 				//ecs.setParallelmodes(res.getInt("parallelmodes"));
 				ecs.setStartposition(res.getInt("startposition"));
@@ -784,6 +796,7 @@
 				+ " startposition ="+ecs.startposition+","
 				+ " stopposition ="+ecs.stopposition+","
 				+ " resetposition ="+ecs.resetposition+","
+				+ " screen_reset = "+ecs.screen_reset+","
 				+ " fanstart = "+ecs.fanstart+","
 				+ " fanstop = "+ecs.fanstop+","
 				+ " dcvol = "+ecs.dcvol+","

--
Gitblit v1.9.1