From e529063f57d712afd69a648e1327e69d07d03cb4 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 20 八月 2020 16:11:11 +0800
Subject: [PATCH] 4个电源添加通讯状态，触摸屏复位，风机控制，控制柜紧急跳闸
---
ElectricalSystem_MonitorServer_4KW/src/com/electrical/FourKW/Electrical_Task_SQL.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 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 0884757..77dc09b 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
@@ -234,6 +234,11 @@
" switchon_2 int(11) NOT NULL DEFAULT '0' COMMENT '2号开关开 '," +
" switchoff_2 int(11) NOT NULL DEFAULT '0' COMMENT '2号开关关'," +
+ " comm_state int(11) NOT NULL DEFAULT '0' COMMENT '通讯状态'," +
+ " screen_reset int(11) NOT NULL DEFAULT '0' COMMENT '触摸屏复位'," +
+ " fan_control int(11) NOT NULL DEFAULT '0' COMMENT '风机控制'," +
+ " emergency_trip int(11) NOT NULL DEFAULT '0' COMMENT '总控柜紧急跳闸'," +
+
" note varchar(255) NOT NULL DEFAULT ''," +
" PRIMARY KEY (num)," +
" UNIQUE KEY electric_id_key (electric_id) USING BTREE " +
@@ -241,6 +246,43 @@
Sql_Mysql sql = new Sql_Mysql(pool.getConn());
try {
sql.sqlMysqlExecute(sql_str);
+ //添加 comm_state 通讯状态字段
+ ResultSet res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+ + " WHERE table_schema='db_electricsystem'"
+ + " AND table_name='tb_electric_rt'"
+ + " AND column_name='comm_state'");
+ if(false == res.next()) {
+ sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
+ + " ADD COLUMN comm_state int(11) NOT NULL DEFAULT '0' COMMENT '通讯状态' after workmodelflag;");
+ }
+ //添加 screen_reset 触摸屏复位
+ res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+ + " WHERE table_schema='db_electricsystem'"
+ + " AND table_name='tb_electric_rt'"
+ + " AND column_name='screen_reset'");
+ if(false == res.next()) {
+ sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
+ + " ADD COLUMN screen_reset int(11) NOT NULL DEFAULT '0' COMMENT '通讯状态' after comm_state;");
+ }
+ //添加 fan_control 风机控制
+ res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+ + " WHERE table_schema='db_electricsystem'"
+ + " AND table_name='tb_electric_rt'"
+ + " AND column_name='fan_control'");
+ if(false == res.next()) {
+ sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
+ + " ADD COLUMN fan_control int(11) NOT NULL DEFAULT '0' COMMENT '通讯状态' after screen_reset;");
+ }
+ //添加 emergency_trip 总控柜紧急跳闸
+ res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+ + " WHERE table_schema='db_electricsystem'"
+ + " AND table_name='tb_electric_rt'"
+ + " AND column_name='emergency_trip'");
+ if(false == res.next()) {
+ sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Electric_Rt
+ + " ADD COLUMN emergency_trip int(11) NOT NULL DEFAULT '0' COMMENT '通讯状态' after fan_control;");
+ }
+
} catch (SQLException e) {
e.printStackTrace();
} finally {
@@ -433,8 +475,8 @@
}
//插入或更新电源实时信息表
public static void replace_Electric_Rt(MysqlConnPool pool,Electric_Rt ert) {
- String sql_str = " replace into "+ Sql_Mysql.Tb_Electric_Rt +"(electric_id,upsetcurr,upsetvol,convolcontrol,concurrcontrol,othermodes,parallelmodes,startposition,stopposition,resetposition,fanstart,fanstop,dcvol,dccurr,controlangle,loopflag,remoteflag,orderflag,consvolcurrflag,powerstartflag,workmodelflag,switchon_1,switchoff_1,switchon_2,switchoff_2) "
- + " values("+ert.electric_id+","+ert.upsetcurr+","+ert.upsetvol+","+ert.convolcontrol+","+ert.concurrcontrol+","+ert.othermodes+","+ert.parallelmodes+","+ert.startposition+","+ert.stopposition+","+ert.resetposition+","+ert.fanstart+","+ert.fanstop+","+ert.dcvol+","+ert.dccurr+","+ert.controlangle+","+ert.loopflag+","+ert.remoteflag+","+ert.orderflag+","+ert.consvolcurrflag+","+ert.powerstartflag+","+ert.workmodelflag+","+ert.switchon_1+","+ert.switchoff_1+","+ert.switchon_2+","+ert.switchoff_2+")";
+ String sql_str = " replace into "+ Sql_Mysql.Tb_Electric_Rt +"(electric_id,upsetcurr,upsetvol,convolcontrol,concurrcontrol,othermodes,parallelmodes,startposition,stopposition,resetposition,fanstart,fanstop,dcvol,dccurr,controlangle,loopflag,remoteflag,orderflag,consvolcurrflag,powerstartflag,workmodelflag,switchon_1,switchoff_1,switchon_2,switchoff_2,comm_state,screen_reset,fan_control,emergency_trip) "
+ + " values("+ert.electric_id+","+ert.upsetcurr+","+ert.upsetvol+","+ert.convolcontrol+","+ert.concurrcontrol+","+ert.othermodes+","+ert.parallelmodes+","+ert.startposition+","+ert.stopposition+","+ert.resetposition+","+ert.fanstart+","+ert.fanstop+","+ert.dcvol+","+ert.dccurr+","+ert.controlangle+","+ert.loopflag+","+ert.remoteflag+","+ert.orderflag+","+ert.consvolcurrflag+","+ert.powerstartflag+","+ert.workmodelflag+","+ert.switchon_1+","+ert.switchoff_1+","+ert.switchon_2+","+ert.switchoff_2+","+ert.comm_state+","+ert.screen_reset+","+ert.fan_control+","+ert.emergency_trip+")";
Sql_Mysql sql = new Sql_Mysql(pool.getConn());
try {
sql.sqlMysqlExecute(sql_str);
--
Gitblit v1.9.1