BattMonitor_DB_Builder/config.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
BattMonitor_DB_Builder/src/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
BattMonitor_DB_Builder/src/com/database_util/DB_battinf.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/config.xml
@@ -2,7 +2,7 @@ <root> <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en> <mysql_server_ip>118.89.139.230</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/battdata_rt/BattData_RT_RamDB_Thread_SQL.java
@@ -72,13 +72,16 @@ sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.BattRtData_Table + " ADD COLUMN `mon_LY_vol` FLOAT NOT NULL DEFAULT 0;"); } ResultSet res_t = sql.sqlMysqlQuery("SELECT BattGroupId,MonCount FROM " + Sql_Mysql.BattInf_Table); ResultSet res_t = sql.sqlMysqlQuery("SELECT BattGroupId,MonCount,FBSDeviceId,PackCount FROM " + Sql_Mysql.BattInf_Table); while(res_t.next()) { int bg_id = res_t.getInt("BattGroupId"); int mon_cnt = res_t.getInt("MonCount"); if(mon_cnt > 0){ int pack_count = res_t.getInt("PackCount"); int FBSDeviceId = res_t.getInt("FBSDeviceId"); if(checkLiBTSDevType(FBSDeviceId) && pack_count > 0) { mon_cnt = mon_cnt * pack_count; } if(mon_cnt > 0){ int max_monnum = seachBattMaxMonNum(conn_pool,bg_id); //当前电池组在 tb_batt_rtdata 表中的最大单体个数 if(mon_cnt > max_monnum){ //需要从max_monnum开始添加单体记录 @@ -548,5 +551,21 @@ public static void main(String[] args) { MysqlConnPool conn_pool = new MysqlConnPool("127.0.0.1",3360,5); System.out.println(updateTb_App_Sys_AppServerTable(conn_pool)); System.out.println(checkLiBTSDevType(910000001)); } /** * 校验当前设备是否是锂电BTS * @param dev_id * @return */ public static boolean checkLiBTSDevType(int dev_id) { if(dev_id/100000 == 9131) { return true; } return false; } } BattMonitor_DB_Builder/src/com/database_util/DB_battinf.java
@@ -642,6 +642,7 @@ " `buscouple_state` int(11) DEFAULT '0' COMMENT '母联状态:0:无母联;1:有母联'," + " `tmp_id` int(11) DEFAULT '0'," + " `price_factor` float DEFAULT '1' COMMENT '电价系数'," + " `PackCount` int DEFAULT '1' COMMENT '锂电池包数量'," + " PRIMARY KEY (`num`)," + " UNIQUE KEY `index_battgroup_id` (`BattGroupId`) USING BTREE," + " KEY `index_station_id` (`StationId`)," + @@ -947,6 +948,17 @@ sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.BattInf_Table + " ADD COLUMN `price_factor` float DEFAULT '1' COMMENT '电价系数';"); } //添加PackCount锂电池包数量-新疆锂电BTS时新增 res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns" + " WHERE table_schema='db_battinf'" + " AND table_name='tb_battinf'" + " AND column_name='PackCount'"); if(false == res.next()) { sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.BattInf_Table + " ADD COLUMN `PackCount` int DEFAULT '1' COMMENT '锂电池包数量';"); } //添加sort_id res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns" + " WHERE table_schema='db_battinf'" @@ -954,7 +966,7 @@ + " AND column_name='sort_id'"); if(false == res.next()) { sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.BattInf_Table + " ADD COLUMN `sort_id` float DEFAULT '1' COMMENT '电价系数';"); + " ADD COLUMN `sort_id` float DEFAULT '1' COMMENT '';"); } //设置column 去掉默认NOT NULL BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt
@@ -417,4 +417,8 @@ V2.17 edit at date 2022-04-08 1.修改表`db_ram_db`.`tb_li9130_bms_alm`表新增字段-->用于新疆锂电BTS包协议扩展 `sys_tmp_code` int(11) NOT NULL DEFAULT '0' COMMENT '系统温度事件代码' `sys_tmp_code` int(11) NOT NULL DEFAULT '0' COMMENT '系统温度事件代码' V2.18 edit at date 2022-04-09 1.修改表`db_battinf`.`tb_battinf`表新增字段-->用于标识当前新疆锂电BTS包的数量 `PackCount` int DEFAULT '1' COMMENT '锂电池包数量' BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java
@@ -73,6 +73,9 @@ /*********************************************************************************/ boolean recreate_tb = m_AppConfig.getMysqlDB_RecreateEn(); //初始化数据库 db_battinf DB_battinf.init(GB_MysqlConnPool, recreate_tb); //初始话db_ram_db数据库 DB_Ram_db.init(GB_MysqlConnPool, recreate_tb); @@ -129,8 +132,7 @@ FBS9100_Task_Thread_SQL.createFBS9100_offlineyhplanOnRam(GB_MysqlConnPool, recreate_tb); //初始化数据库 db_battinf DB_battinf.init(GB_MysqlConnPool, recreate_tb); //初始化数据库 web_site DB_web_site.init(GB_MysqlConnPool, recreate_tb);