From ae8381cc23f222b9d5bc7f8630a59319db6cf54e Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期五, 12 四月 2024 09:14:02 +0800
Subject: [PATCH] V10.03 edit at date 2024-04-12 	1.'db_ckpwrdev_data_rt.tb_ckpowerdev_modecontrol'新增字段 		`monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动 0-自动', 		`monitor_mode_flag` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式 控制标识[1- 需要控制  0-不需要控制]', 	2.'db_ckpwrdev_data_rt.tb_ckpowerdev_signal'新增字段 		`monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动 0-自动',

---
 BattMonitor_DB_Builder/src/com/database_util/DB_Ckpwrdev_Data_RT.java  |   50 ++++++++++++++++++++++++-
 BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java               |    2 
 BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt             |    7 +++
 BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt             |    7 +++
 BattMonitor_DB_Builder/bin/com/database_util/DB_Ckpwrdev_Data_RT.class |    0 
 5 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/BattMonitor_DB_Builder/bin/com/database_util/DB_Ckpwrdev_Data_RT.class b/BattMonitor_DB_Builder/bin/com/database_util/DB_Ckpwrdev_Data_RT.class
index d0aaae2..804c03d 100644
--- a/BattMonitor_DB_Builder/bin/com/database_util/DB_Ckpwrdev_Data_RT.class
+++ b/BattMonitor_DB_Builder/bin/com/database_util/DB_Ckpwrdev_Data_RT.class
Binary files differ
diff --git a/BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt b/BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt
index 5976243..91235a2 100644
--- a/BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt
+++ b/BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt
@@ -1,6 +1,13 @@
 南京测控平台数据库初始化程序
 	注意:1.新增电源机房时需要重新运行
 
+V10.03 edit at date 2024-04-12
+	1.'db_ckpwrdev_data_rt.tb_ckpowerdev_modecontrol'新增字段
+		`monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动  0-自动',
+		`monitor_mode_flag` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式 控制标识[1- 需要控制  0-不需要控制]',
+	2.'db_ckpwrdev_data_rt.tb_ckpowerdev_signal'新增字段
+		`monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动  0-自动',
+
 V10.02 edit at date 2024-04-08
 	1.表'db_ckpwrdev_inf.tb_ckpwrdev_inf'新增字段用于测控平台判断模块的标识位
 
diff --git a/BattMonitor_DB_Builder/src/com/database_util/DB_Ckpwrdev_Data_RT.java b/BattMonitor_DB_Builder/src/com/database_util/DB_Ckpwrdev_Data_RT.java
index 4cd7700..b2b7304 100644
--- a/BattMonitor_DB_Builder/src/com/database_util/DB_Ckpwrdev_Data_RT.java
+++ b/BattMonitor_DB_Builder/src/com/database_util/DB_Ckpwrdev_Data_RT.java
@@ -814,14 +814,42 @@
 				"  UNIQUE KEY `idx_power_device_id` (`power_device_id`) USING BTREE" + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='测控电源模块控制表';";
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+		ResultSet res = null;
 		try {
 			if(true == recreate) {			
 				sql.sqlMysqlExecute(sql_str01);
 			}
-			sql.sqlMysqlExecute(sql_str02);		
+			sql.sqlMysqlExecute(sql_str02);	
+			
+			//新增字段monitor_mode
+			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+					+ " WHERE table_schema='db_ckpwrdev_data_rt'"
+					+ " AND table_name='tb_ckpowerdev_modecontrol'"
+					+ " AND column_name='monitor_mode'");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Ckpowerdev_ModeControl_Table 
+						+ " ADD column `monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动  0-自动';");
+			}
+			res = null;
+			//新增字段monitor_mode
+			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+					+ " WHERE table_schema='db_ckpwrdev_data_rt'"
+					+ " AND table_name='tb_ckpowerdev_modecontrol'"
+					+ " AND column_name='monitor_mode_flag'");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Ckpowerdev_ModeControl_Table 
+						+ " ADD column `monitor_mode_flag` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式 控制标识[1- 需要控制  0-不需要控制]';");
+			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} finally {
+			if(null != res) {
+				try {
+					res.close();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
 			sql.close_con();
 		}
 	}
@@ -1637,14 +1665,32 @@
 				"  UNIQUE KEY `idx_power_device_id` (`power_device_id`) USING BTREE" + 
 				") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='测控电源遥信状态表';";
 		Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+		ResultSet res = null;
 		try {
 			if(true == recreate) {			
 				sql.sqlMysqlExecute(sql_str01);
 			}
-			sql.sqlMysqlExecute(sql_str02);		
+			sql.sqlMysqlExecute(sql_str02);	
+			
+			//新增字段monitor_mode
+			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
+					+ " WHERE table_schema='db_ckpwrdev_data_rt'"
+					+ " AND table_name='tb_ckpowerdev_signal'"
+					+ " AND column_name='monitor_mode'");
+			if(!res.next()) {
+				sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Ckpowerdev_Signal_Table 
+						+ " ADD column `monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动  0-自动';");
+			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} finally {
+			if(null != res) {
+				try {
+					res.close();
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}
+			}
 			sql.close_con();
 		}
 	}
diff --git a/BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt b/BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt
index 5976243..91235a2 100644
--- a/BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt
+++ b/BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt
@@ -1,6 +1,13 @@
 南京测控平台数据库初始化程序
 	注意:1.新增电源机房时需要重新运行
 
+V10.03 edit at date 2024-04-12
+	1.'db_ckpwrdev_data_rt.tb_ckpowerdev_modecontrol'新增字段
+		`monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动  0-自动',
+		`monitor_mode_flag` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式 控制标识[1- 需要控制  0-不需要控制]',
+	2.'db_ckpwrdev_data_rt.tb_ckpowerdev_signal'新增字段
+		`monitor_mode` int(11) NOT NULL DEFAULT '0' COMMENT '监控管理模式  1-手动  0-自动',
+
 V10.02 edit at date 2024-04-08
 	1.表'db_ckpwrdev_inf.tb_ckpwrdev_inf'新增字段用于测控平台判断模块的标识位
 
diff --git a/BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java b/BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java
index 0365726..f864eef 100644
--- a/BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java
+++ b/BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java
@@ -17,7 +17,7 @@
 	/**************************************************************************/
 	/**************************************************************************/
 	public final static boolean app_debug = false;
-	public final static float m_VersionNum = (float) 10.02;
+	public final static float m_VersionNum = (float) 10.03;
 	public final static String m_Version = "Welcome To Use BTS DB BUILDER V" + m_VersionNum + " RC_20180908";
 	/**************************************************************************/
 	/**************************************************************************/

--
Gitblit v1.9.1