From 56c672f46d4b901b1ee4b1ee47768ed53ec5e6a8 Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期四, 08 七月 2021 11:52:25 +0800
Subject: [PATCH] V1.60 edit at date 2021-07-08 1.新建'db_ram_db.`tb_fbs9100s_buscouple_state`'-->'母联开关状态表'数据库表 1.新建'db_ram_db.`tb_fbs9100s_stemnode_state`'-->'干接点状态表'数据库表
---
BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java | 92 ++++++++++++++++++++++++++++++++++++++++++++++
BattMonitor_DB_Builder/config.xml | 2
BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java | 2
BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt | 4 ++
BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt | 4 ++
BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java | 2 +
6 files changed, 104 insertions(+), 2 deletions(-)
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 4e4d091..631ef79 100644
--- a/BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt
+++ b/BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt
@@ -178,4 +178,8 @@
V1.59 edit at date 2021-07-02
1.新建'db_user.`tb_user_log`'数据库表
+
+V1.60 edit at date 2021-07-08
+ 1.新建'db_ram_db.`tb_fbs9100s_buscouple_state`'-->'母联开关状态表'数据库表
+ 1.新建'db_ram_db.`tb_fbs9100s_stemnode_state`'-->'干接点状态表'数据库表
\ No newline at end of file
diff --git a/BattMonitor_DB_Builder/config.xml b/BattMonitor_DB_Builder/config.xml
index c81882e..083cfd1 100644
--- a/BattMonitor_DB_Builder/config.xml
+++ b/BattMonitor_DB_Builder/config.xml
@@ -2,7 +2,7 @@
<root>
<mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
- <mysql_server_ip>127.0.0.1</mysql_server_ip>
+ <mysql_server_ip>192.168.10.79</mysql_server_ip>
<!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
<!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
<!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->
diff --git a/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java b/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java
index e1b03a4..887c366 100644
--- a/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java
+++ b/BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java
@@ -79,9 +79,18 @@
createTb_Batt_RTAlarm_Table(pool, recreate);
//南京送检特有
createTb_Batt_RSAlarm_Table(pool, recreate);
+
+ //创建干节点状态表
+ createFBS9100s_stemnode_state_Table(pool, recreate);
+
+ //创建母联开关状态表
+ createFBS9100s_buscouple_state_Table(pool, recreate);
}
+
+
+
/**
* 创建 web_site 数据库
* @param pool
@@ -1839,4 +1848,87 @@
sql.close_con();
}
}
+
+ /**
+ * 创建干接点状态表
+ * @param pool
+ * @param recreate
+ */
+ private static void createFBS9100s_stemnode_state_Table(MysqlConnPool pool, boolean recreate) {
+ String sql_str01 = " DROP TABLE IF EXISTS "+Sql_Mysql.FBS9100s_stemnode_state_Table;
+ String sql_str02 = "CREATE TABLE IF NOT EXISTS " + Sql_Mysql.FBS9100s_stemnode_state_Table + " (" +
+ " `num` bigint(20) NOT NULL AUTO_INCREMENT," +
+ " `dev_id` int(11) NOT NULL," +
+ " `record_time` datetime NOT NULL DEFAULT '2000-01-01 00:00:00' COMMENT '记录时间'," +
+ " `dryInputState` int(11) NOT NULL DEFAULT '0' COMMENT '干节点输入状态'," +
+ " `dryOutputState` int(11) NOT NULL DEFAULT '0' COMMENT '干节点输出状态'," +
+ " `volOutputState` int(11) NOT NULL DEFAULT '0' COMMENT '干节点电压输出状态'," +
+ " `sumOutputVolt` float NOT NULL DEFAULT '0' COMMENT '总输出电压'," +
+ " `sumOutputCur` float NOT NULL DEFAULT '0' COMMENT '总输出电流'," +
+ " `outputVolt1` float NOT NULL DEFAULT '0' COMMENT '输出电压1'," +
+ " `outputVolt2` float NOT NULL DEFAULT '0' COMMENT '输出电压2'," +
+ " `outputVolt3` float NOT NULL DEFAULT '0' COMMENT '输出电压3'," +
+ " `outputVolt4` float NOT NULL DEFAULT '0' COMMENT '输出电压4'," +
+ " PRIMARY KEY (`num`)," +
+ " UNIQUE KEY `index_dev_id` (`dev_id`) USING BTREE" +
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8;";
+ Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+
+ try {
+ if(true == recreate) {
+ sql.sqlMysqlExecute(sql_str01);
+ }
+ sql.sqlMysqlExecute(sql_str02);
+
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally {
+ sql.close_con();
+ }
+
+ }
+
+ /**
+ * 创建母联状态表
+ * @param pool
+ * @param recreate
+ */
+ private static void createFBS9100s_buscouple_state_Table(MysqlConnPool pool, boolean recreate) {
+ String sql_str01 = " DROP TABLE IF EXISTS "+Sql_Mysql.FBS9100s_buscouple_state_Table;
+ String sql_str02 = "CREATE TABLE IF NOT EXISTS " + Sql_Mysql.FBS9100s_buscouple_state_Table + " (" +
+ " `num` bigint(20) NOT NULL AUTO_INCREMENT," +
+ " `dev_id` int(11) NOT NULL DEFAULT '912000001' COMMENT '设备id'," +
+ " `record_time` datetime NOT NULL DEFAULT '2000-01-01 00:00:00' COMMENT '记录时间'," +
+ " `fanglei_state` int(11) NOT NULL DEFAULT '0' COMMENT '防雷状态:0:未连接;1:正常工作;2需要更换防雷设备'," +
+ " `workstate` int(11) NOT NULL DEFAULT '0' COMMENT '工作状态'," +
+ " `rlayworkmode` int(11) NOT NULL DEFAULT '0' COMMENT '空开操作状态'," +
+ " `rlyAstate` int(11) NOT NULL DEFAULT '0' COMMENT '开关输入ON状态'," +
+ " `rlyBstate` int(11) NOT NULL DEFAULT '0' COMMENT '开关输入OFF状态'," +
+ " `stopreson` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因'," +
+ " `volt_m1` float NOT NULL DEFAULT '0' COMMENT '电压1'," +
+ " `volt_m2` float NOT NULL DEFAULT '0' COMMENT '电压2'," +
+ " `iout` float NOT NULL DEFAULT '0' COMMENT '电流'," +
+ " `curdir` int(11) NOT NULL DEFAULT '0' COMMENT '电流方向'," +
+ " `commustate` int(11) NOT NULL DEFAULT '0' COMMENT '通信状态'," +
+ " PRIMARY KEY (`num`)," +
+ " UNIQUE KEY `index_dev_id` (`dev_id`) USING BTREE" +
+ ") ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;";
+ Sql_Mysql sql = new Sql_Mysql(pool.getConn());
+
+ try {
+ if(true == recreate) {
+ sql.sqlMysqlExecute(sql_str01);
+ }
+ sql.sqlMysqlExecute(sql_str02);
+
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } finally {
+ sql.close_con();
+ }
+
+ }
+
+
+
}
diff --git a/BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java b/BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java
index 34f6097..f4a38f2 100644
--- a/BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java
+++ b/BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java
@@ -145,6 +145,8 @@
public final static String Tb_Batt_RSAlarm_Table = DB_RamDB + ".`tb_batt_rsalarm`"; //锂电池数据表
public final static String Tb_Batt_RTAlarm_Table = DB_RamDB + ".`tb_batt_rtalarm`"; //锂电池数据表
+ public final static String FBS9100s_stemnode_state_Table = DB_RamDB + ".`tb_fbs9100s_stemnode_state`"; //干节点状态表
+ public final static String FBS9100s_buscouple_state_Table = DB_RamDB + ".`tb_fbs9100s_buscouple_state`"; //母联开关状态表
/**************************** db_user数据库 ***************************************************/
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 4e4d091..631ef79 100644
--- a/BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt
+++ b/BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt
@@ -178,4 +178,8 @@
V1.59 edit at date 2021-07-02
1.新建'db_user.`tb_user_log`'数据库表
+
+V1.60 edit at date 2021-07-08
+ 1.新建'db_ram_db.`tb_fbs9100s_buscouple_state`'-->'母联开关状态表'数据库表
+ 1.新建'db_ram_db.`tb_fbs9100s_stemnode_state`'-->'干接点状态表'数据库表
\ No newline at end of file
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 a80fb45..a989387 100644
--- a/BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java
+++ b/BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java
@@ -26,7 +26,7 @@
/**************************************************************************/
/**************************************************************************/
public final static boolean app_debug = false;
- public final static float m_VersionNum = (float) 1.59;
+ public final static float m_VersionNum = (float) 1.60;
public final static String m_Version = "Welcome To Use BTS DB BUILDER V" + m_VersionNum + " RC_20180908";
/**************************************************************************/
/**************************************************************************/
--
Gitblit v1.9.1