| BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BattMonitor_DB_Builder/config.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BattMonitor_DB_Builder/src/com/database_util/DB_Fbo_testdata.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt
@@ -205,4 +205,8 @@ V1.67 edit at date 2021-08-17 1.db_battinf.tb_battinf表新增视频链接地址字段'video_url' 2.db_battinf.tb_battinf表新增逆变充放电状态'charge_type'和母联状态'buscouple_state' 3.新增数据库db_fbo_testdata,用于存放从充放电一体机导入的历史数据文件 4.在数据库'db_fbo_testdata'中新增表'tb_fbotestdata_inf'用于存放历史数据导入记录 5.新增'db_ram_db.tb_fgcd_filedownload'表用于充放电一体机历史数据远程导入
@@ -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--> BattMonitor_DB_Builder/src/com/database_util/DB_Fbo_testdata.java
New file @@ -0,0 +1,74 @@ package com.database_util; import java.sql.SQLException; import com.sql.MysqlConnPool; import com.sql.Sql_Mysql; public class DB_Fbo_testdata { public static void init(MysqlConnPool pool, boolean recreate) { createDB_FBO_TESTDATA(pool); createFbotestdata_Inf_Table(pool, recreate); //创建历史数据inf表 } /** * 创建 db_param 数据库 * @param pool */ public static void createDB_FBO_TESTDATA(MysqlConnPool pool) { Sql_Mysql sql = new Sql_Mysql(pool.getConn()); try { sql.sqlMysqlExecute("CREATE DATABASE IF NOT EXISTS " + Sql_Mysql.DB_FBO_TESTDATA); } catch (SQLException e) { e.printStackTrace(); } finally { sql.close_con(); } } /** * 创建 tb_fbotestdata_inf 表 * @param pool * @param recreate */ public static void createFbotestdata_Inf_Table(MysqlConnPool pool, boolean recreate) { String sql_str01 = " DROP TABLE IF EXISTS "+Sql_Mysql.Fbotestdata_Inf_Table; String sql_str02 = " CREATE TABLE IF NOT EXISTS " + Sql_Mysql.Fbotestdata_Inf_Table + " (" + " `num` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键'," + " `BattGroupId` int(11) NOT NULL DEFAULT '0' COMMENT '电池组ID'," + " `test_record_count` int(11) NOT NULL DEFAULT '0' COMMENT '放电笔数'," + " `test_starttime` datetime NOT NULL DEFAULT '2000-01-01 00:00:00' COMMENT '测试开始时间'," + " `test_timelong` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长'," + " `device` int(11) NOT NULL DEFAULT '0' COMMENT '仪表类型'," + " `test_type` int(11) NOT NULL DEFAULT '0' COMMENT '测试类型'," + " `hourrate` int(11) NOT NULL DEFAULT '0' COMMENT '小时率'," + " `save_interval` int(11) NOT NULL DEFAULT '0' COMMENT '采集间隔'," + " `monomervol` float NOT NULL DEFAULT '0' COMMENT '单体电压类型'," + " `moncapstd` float NOT NULL DEFAULT '0' COMMENT '标称容量'," + " `test_curr` float NOT NULL DEFAULT '0' COMMENT '测试电流'," + " `test_cap` float NOT NULL DEFAULT '0' COMMENT '测试容量'," + " `monvol_limit` float NOT NULL DEFAULT '0' COMMENT '单体下限'," + " `gourpvol_limit` float NOT NULL DEFAULT '0' COMMENT '组端下限'," + " `mon_count` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量'," + " `monvol_limitcount` int(11) NOT NULL DEFAULT '0' COMMENT '单体下限数量'," + " `stop_type` int(11) NOT NULL DEFAULT '0' COMMENT '结束方式'," + " `download_time` datetime NOT NULL DEFAULT '2000-01-01 00:00:00' COMMENT '上传时间'," + " PRIMARY KEY (`num`)" + ") ENGINE=InnoDB AUTO_INCREMENT=31 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(); } } } BattMonitor_DB_Builder/src/com/database_util/DB_Ram_db.java
@@ -85,6 +85,9 @@ //创建母联开关状态表 createFBS9100s_buscouple_state_Table(pool, recreate); //创建FGCD充放电一体机下载控制表 createFgcd_filedownload_Table(pool, recreate); } @@ -2000,6 +2003,138 @@ } /** * 创建充放电一体机下载控制表 * @param pool * @param recreate */ private static void createFgcd_filedownload_Table(MysqlConnPool pool, boolean recreate) { String sql_str01 = " DROP TABLE IF EXISTS "+Sql_Mysql.Fgcd_filedownload_Table; String sql_str02 = "CREATE TABLE IF NOT EXISTS " + Sql_Mysql.Fgcd_filedownload_Table + " (" + " `num` bigint(20) NOT NULL AUTO_INCREMENT," + " `dev_id` int(11) NOT NULL DEFAULT '0' COMMENT '设备id'," + " `BattGroupId` int(11) NOT NULL DEFAULT '0' COMMENT '电池组ID'," + " `op_cmd` int(11) NOT NULL DEFAULT '0' COMMENT '命令'," + " `file_total` int(11) NOT NULL DEFAULT '0' COMMENT '总的文件数目'," + " `file_count` int(11) NOT NULL DEFAULT '0' COMMENT '当前页数据文件数'," + " `file_index` int(11) NOT NULL DEFAULT '0' COMMENT '需要下载文件索引'," + " `file_name1` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名1'," + " `file_index1` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引1'," + " `test_timelong1` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长1'," + " `data_type1` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型1'," + " `test_curr1` float NOT NULL DEFAULT '0' COMMENT '测试电流1'," + " `test_cap1` float NOT NULL DEFAULT '0' COMMENT '测试容量1'," + " `cap_std1` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量1'," + " `mon_count1` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量1'," + " `mon_vol1` float NOT NULL DEFAULT '0' COMMENT '单体电压类型1'," + " `stop_type1` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因1'," + " `download_flag1` int(11) NOT NULL DEFAULT '0' COMMENT '下载标识1'," + " `download_state1` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态1'," + " `file_name2` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名2'," + " `file_index2` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引2'," + " `test_timelong2` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长2'," + " `data_type2` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型2'," + " `test_curr2` float NOT NULL DEFAULT '0' COMMENT '测试电流2'," + " `test_cap2` float NOT NULL DEFAULT '0' COMMENT '测试容量2'," + " `cap_std2` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量2'," + " `mon_count2` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量2'," + " `mon_vol2` float NOT NULL DEFAULT '0' COMMENT '单体电压类型2'," + " `stop_type2` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因2'," + " `download_flag2` int(11) NOT NULL DEFAULT '0' COMMENT '下载标识2'," + " `download_state2` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态2'," + " `file_name3` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名3'," + " `file_index3` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引3'," + " `test_timelong3` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长3'," + " `data_type3` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型3'," + " `test_curr3` float NOT NULL DEFAULT '0' COMMENT '测试电流3'," + " `test_cap3` float NOT NULL DEFAULT '0' COMMENT '测试容量3'," + " `cap_std3` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量3'," + " `mon_count3` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量3'," + " `mon_vol3` float NOT NULL DEFAULT '0' COMMENT '单体电压类型3'," + " `stop_type3` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因3'," + " `download_flag3` int(11) NOT NULL DEFAULT '0' COMMENT '下载标识3'," + " `download_state3` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态3'," + " `file_name4` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名4'," + " `file_index4` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引4'," + " `test_timelong4` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长4'," + " `data_type4` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型4'," + " `test_curr4` float NOT NULL DEFAULT '0' COMMENT '测试电流4'," + " `test_cap4` float NOT NULL DEFAULT '0' COMMENT '测试容量4'," + " `cap_std4` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量4'," + " `mon_count4` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量4'," + " `mon_vol4` float NOT NULL DEFAULT '0' COMMENT '单体电压类型4'," + " `download_flag4` int(11) NOT NULL DEFAULT '0' COMMENT '下载标识4'," + " `download_state4` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态4'," + " `stop_type4` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因4'," + " `file_name5` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名5'," + " `file_index5` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引5'," + " `test_timelong5` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长5'," + " `data_type5` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型5'," + " `test_curr5` float NOT NULL DEFAULT '0' COMMENT '测试电流5'," + " `test_cap5` float NOT NULL DEFAULT '0' COMMENT '测试容量5'," + " `cap_std5` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量5'," + " `mon_count5` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量5'," + " `mon_vol5` float NOT NULL DEFAULT '0' COMMENT '单体电压类型5'," + " `stop_type5` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因5'," + " `download_flag5` int(11) NOT NULL DEFAULT '0' COMMENT '下载标识5'," + " `download_state5` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态5'," + " `file_name6` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名6'," + " `file_index6` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引6'," + " `test_timelong6` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长6'," + " `data_type6` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型6'," + " `test_curr6` float NOT NULL DEFAULT '0' COMMENT '测试电流6'," + " `test_cap6` float NOT NULL DEFAULT '0' COMMENT '测试容量6'," + " `cap_std6` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量6'," + " `mon_count6` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量6'," + " `mon_vol6` float NOT NULL DEFAULT '0' COMMENT '单体电压类型6'," + " `stop_type6` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因6'," + " `download_flag6` int(11) NOT NULL DEFAULT '0' COMMENT '下载标识6'," + " `download_state6` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态6'," + " `file_name7` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名7'," + " `file_index7` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引7'," + " `test_timelong7` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长7'," + " `data_type7` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型7'," + " `test_curr7` float NOT NULL DEFAULT '0' COMMENT '测试电流7'," + " `test_cap7` float NOT NULL DEFAULT '0' COMMENT '测试容量7'," + " `cap_std7` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量7'," + " `mon_count7` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量7'," + " `mon_vol7` float NOT NULL DEFAULT '0' COMMENT '单体电压类型7'," + " `stop_type7` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因7'," + " `download_flag7` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态7'," + " `download_state7` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态7'," + " `file_name8` varchar(255) NOT NULL DEFAULT '' COMMENT '文件名8'," + " `file_index8` int(11) NOT NULL DEFAULT '0' COMMENT '文件索引8'," + " `test_timelong8` int(11) NOT NULL DEFAULT '0' COMMENT '测试时长8'," + " `data_type8` int(11) NOT NULL DEFAULT '0' COMMENT '数据类型8'," + " `test_curr8` float NOT NULL DEFAULT '0' COMMENT '测试电流8'," + " `test_cap8` float NOT NULL DEFAULT '0' COMMENT '测试容量8'," + " `cap_std8` int(11) NOT NULL DEFAULT '0' COMMENT '标称容量8'," + " `mon_count8` int(11) NOT NULL DEFAULT '0' COMMENT '单体数量8'," + " `mon_vol8` float NOT NULL DEFAULT '0' COMMENT '单体电压类型8'," + " `stop_type8` int(11) NOT NULL DEFAULT '0' COMMENT '停止原因8'," + " `download_flag8` int(11) NOT NULL DEFAULT '0' COMMENT '下载标识8'," + " `download_state8` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态8'," + " `stop_reason` int(11) NOT NULL DEFAULT '0' COMMENT '异常停止原因'," + " `download_state` int(11) NOT NULL DEFAULT '0' COMMENT '下载状态[1:下载文件;2:生成文件;3:解析数据;4:导入完成]'," + " `now_data_block` int(11) NOT NULL DEFAULT '0' COMMENT '当前下载进度'," + " `total_data_block` int(11) NOT NULL DEFAULT '0' COMMENT '总的数据块数'," + " PRIMARY KEY (`num`)," + " UNIQUE KEY `index_dev_id` (`dev_id`) USING BTREE" + ") ENGINE=InnoDB AUTO_INCREMENT=2 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(); } } } BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java
@@ -823,6 +823,26 @@ sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.BattInf_Table + " ADD COLUMN `video_url` varchar(200) DEFAULT NULL;"); } //添加charge_type res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns" + " WHERE table_schema='db_battinf'" + " AND table_name='tb_battinf'" + " AND column_name='charge_type'"); if(false == res.next()) { sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.BattInf_Table + " ADD COLUMN `charge_type` int(11) NOT NULL DEFAULT '1' COMMENT '充放电状态：1:限流充电；2；逆变充电';"); } //添加buscouple_state res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns" + " WHERE table_schema='db_battinf'" + " AND table_name='tb_battinf'" + " AND column_name='buscouple_state'"); if(false == res.next()) { sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.BattInf_Table + " ADD COLUMN `buscouple_state` int(11) NOT NULL DEFAULT '0' COMMENT '母联状态：0：无母联；1:有母联';"); } } catch (SQLException e) { e.printStackTrace(); } finally { BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java
@@ -31,6 +31,7 @@ final public static String DB_PWRDEV_ALARM = "`db_pwrdev_alarm`"; final public static String DB_PWRDEV_DATA_RT = "`db_pwrdev_data_rt`"; final public static String DB_PWRDEV_INF = "`db_pwrdev_inf`"; final public static String DB_FBO_TESTDATA = "`db_fbo_testdata`"; //--------------------------------------------------------------------------------------------// @@ -147,6 +148,7 @@ 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`"; //母联开关状态表 public final static String Fgcd_filedownload_Table = DB_RamDB + ".`tb_fgcd_filedownload`"; //FGCD充放电一体机控制 /**************************** db_user数据库 ***************************************************/ @@ -256,7 +258,7 @@ public final static String Pwrdev_Dcdata_Table = DB_PWRDEV_DATA_RT + ".`tb_pwrdev_dcdata`"; public final static String Pwrdev_Acdata_Table = DB_PWRDEV_DATA_RT + ".`tb_pwrdev_acdata`"; /***************************** db_pwrdev_inf 数据库 ************************************/ /***************************** db_pwrdev_inf 数据库 ************************************/ public final static String Pwrdev_Inf_Table = DB_PWRDEV_INF + ".`tb_pwrdev_inf`"; public final static String Pwrapp_Sys_Table = DB_PWRDEV_INF + ".`tb_pwrapp_sys`"; public final static String Display_Config_Table = DB_PWRDEV_INF + ".`tb_display_config`"; @@ -267,6 +269,10 @@ public final static String Pwrapp_Acdcinf_Table = DB_PWRDEV_INF + ".`tb_pwrapp_acdcinf`"; /***************************** db_fbo_testdata 数据库 ************************************/ public final static String Fbotestdata_Inf_Table = DB_FBO_TESTDATA + ".`tb_fbotestdata_inf`"; //--------------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------------// public Connection mysql_con; BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt
@@ -205,4 +205,8 @@ V1.67 edit at date 2021-08-17 1.db_battinf.tb_battinf表新增视频链接地址字段'video_url' 2.db_battinf.tb_battinf表新增逆变充放电状态'charge_type'和母联状态'buscouple_state' 3.新增数据库db_fbo_testdata,用于存放从充放电一体机导入的历史数据文件 4.在数据库'db_fbo_testdata'中新增表'tb_fbotestdata_inf'用于存放历史数据导入记录 5.新增'db_ram_db.tb_fgcd_filedownload'表用于充放电一体机历史数据远程导入
@@ -8,6 +8,7 @@ import com.database_util.DB_Alarm; import com.database_util.DB_App_Sys; import com.database_util.DB_Batt_History; import com.database_util.DB_Fbo_testdata; import com.database_util.DB_Ld9_Testdata; import com.database_util.DB_Param; import com.database_util.DB_Pwrdev_Alarm; @@ -157,6 +158,9 @@ DB_Pwrdev_Inf.init(GB_MysqlConnPool, recreate_tb); //初始化FBO历史文件数据表 DB_Fbo_testdata.init(GB_MysqlConnPool, recreate_tb); //设置重启告警线程 DB_web_site.setUpThreadRestart(GB_MysqlConnPool);
