BattMonitor_DB_Builder/bin/.gitignore
@@ -1 +1,2 @@ /com/ /main/ BattMonitor_DB_Builder/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.classBinary files differ
BattMonitor_DB_Builder/bin/com/dev/fbs9100/FBS9100_Task_Thread_SQL.classBinary files differ
BattMonitor_DB_Builder/bin/com/sql/Sql_Mysql.classBinary files differ
BattMonitor_DB_Builder/bin/main/main_BTS_DB_Builder.classBinary files differ
BattMonitor_DB_Builder/src/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.java
@@ -174,11 +174,11 @@ ResultSet res = null; try { if(true == recreate) { sql.sqlMysqlExecute(sql_str0); sql.sqlMysqlExecute(sql_str1); sql.sqlMysqlExecute(sql_str0); } else { //sql.sqlMysqlExecute("DELETE FROM " + Sql_Mysql.BattRtState_Table); } sql.sqlMysqlExecute(sql_str1); //添加当前测试类型列 res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns" + " WHERE table_schema='db_ram_db'" @@ -440,6 +440,7 @@ + "`op_cmd` INT NOT NULL DEFAULT 0, " + "`AT_cmd` varchar(20) NOT NULL DEFAULT '', " + "`ack_inf` varchar(50) NOT NULL DEFAULT '', " + "`bts_task_inf` varchar(1024) NOT NULL DEFAULT '', " + " UNIQUE INDEX index_dev_id_uniq (`dev_id`), " + " PRIMARY KEY (`num`) ) " + " ENGINE=InnoDB DEFAULT CHARSET=utf8"; BattMonitor_DB_Builder/src/com/dev/fbs9100/FBS9100_Task_Thread_SQL.java
@@ -379,7 +379,6 @@ sql.sqlMysqlExecute(str1); sql.sqlMysqlExecute(str2); } catch (SQLException e) { // TODO Auto-generated catch block e.printStackTrace(); } finally { sql.close_con(); BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java
@@ -91,7 +91,6 @@ public final static String BattMainInf_Table = DB_BATT_INF + ".`tb_batt_maint_inf`"; public final static String BattMainProcess_Table = DB_BATT_INF + ".`tb_batt_maint_process`"; public final static String DEVERRORRECORD_Table = DB_BATT_INF + ".`tb_deverror_record`"; //设备异常记录表 public final static String BattTestDataInf_Table = DB_BATT_TESTDATA + ".`tb_batttestdata_inf`"; @@ -137,8 +136,15 @@ public final static String CustomPage_Table = WEB_Site + ".`tb_custompage`"; //导航数据表 public final static String Announce_Table = WEB_Site + ".`tb_announce`"; //公告表 public final static String BattAttention_Table = WEB_Site + ".`tb_batt_attention`"; //创建电池组单体关注表 public final static String BattpowerOff_Table = WEB_Site + ".`tb_battpower_off`"; //机房停电表 public final static String BattpowerOff_Table = WEB_Site + ".`tb_battpower_off`"; //机房停电表 /***************************** db_battinf数据库 ***************************************/ public final static String DeverrorRecord_Table = DB_BATT_INF + ".`tb_deverror_record`"; //机房问题记录表 public final static String BattinfApply_TABLE = DB_BATT_INF + ".`tb_battinf_apply`"; //机房安装审批表 public final static String BattinfEx_TABLE = DB_BATT_INF + ".`tb_battinf_ex`"; //基站信息表 public final static String BattinfRebuild_TABLE = DB_BATT_INF + ".`tb_battinf_rebuild`"; //机房配组表 public final static String BattmonTestcap_TABLE = DB_BATT_INF + ".`tb_battmon_testcap`"; //机房标准测试曲线记录表 //--------------------------------------------------------------------------------------------// //--------------------------------------------------------------------------------------------// @@ -264,32 +270,6 @@ + "PRIMARY KEY (`num`)) " + "ENGINE=InnoDB DEFAULT CHARSET=utf8;"; String table_2_1 = "CREATE TABLE IF NOT EXISTS "+DEVERRORRECORD_Table+" (" + " `num` int(11) NOT NULL AUTO_INCREMENT," + " `stationid` varchar(64) NOT NULL DEFAULT '42000001'," + " `record_time` datetime NOT NULL DEFAULT '2018-01-01 00:00:00'," + " `error_descript` longtext NOT NULL," + " `uid` int(11) NOT NULL DEFAULT '1002'," + " `uname` varchar(64) NOT NULL DEFAULT ''," + " `error_en` int(11) NOT NULL DEFAULT '0'," + " `error_dispose` longtext NOT NULL," + " `note` varchar(64) NOT NULL DEFAULT ''," + " `picture_one` longblob," + " `picture_two` longblob," + " `picture_three` longblob," + " `picture_four` longblob," + " `picture_num` int(11) NOT NULL DEFAULT '0'," + " `solve_picture_one` longblob," + " `solve_picture_two` longblob," + " `solve_picture_three` longblob," + " `solve_picture_four` longblob," + " `solve_picture_num` int(11) NOT NULL DEFAULT '0'," + " `solve_uid` int(11) NOT NULL DEFAULT '1002'," + " `solve_uname` varchar(64) NOT NULL DEFAULT ''," + " `solve_record_time` datetime NOT NULL DEFAULT '2018-01-01 00:00:00'," + " PRIMARY KEY (`num`)," + " KEY `stationid_index` (`stationid`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8;"; String table_3 = "CREATE TABLE IF NOT EXISTS " + BattMainInf_Table + " ( `num` BIGINT NOT NULL AUTO_INCREMENT, " @@ -541,7 +521,6 @@ sqlMysqlExecute(table_1); sqlMysqlExecute(table_2); sqlMysqlExecute(table_2_1); sqlMysqlExecute(table_3); sqlMysqlExecute(table_3_1); sqlMysqlExecute(table_3_2); BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java
@@ -5,6 +5,7 @@ import com.base.Com; import com.battdata_rt.BattData_RT_RamDB_Thread_SQL; import com.config.AppConfig; import com.database_util.DB_battinf; import com.database_util.DB_web_site; import com.dev.fbs9100.FBS9100S_DFU_SQL; import com.dev.fbs9100.FBS9100_Task_Thread_SQL; @@ -79,13 +80,13 @@ //创建tb_fbs9100s_dcdc_data表 FBS9100_Task_Thread_SQL.createFBS9100S_DCDC_DataTableOnRam(GB_MysqlConnPool); //创建tb_fbs9100s_setparam表 //创建CmccPowerData表 FBS9100_Task_Thread_SQL.createFBS9100CmccPowerDataOnRam(GB_MysqlConnPool); //创建tb_fbs9100S_DFU_StateTable表并向表中添加数据 FBS9100S_DFU_SQL.createFBS9100S_DFU_TableOnRam(GB_MysqlConnPool); } //创建tb_fbs9100s_setparam表 FBS9100_Task_Thread_SQL.createFBS9100SetTestParamTableOnRam(GB_MysqlConnPool,recreate_tb); //创建tb_fbs9100s_state表 @@ -94,11 +95,17 @@ //创建BTSStationState_Table表 FBS9100_Task_Thread_SQL.createBTSStationState_TableOnRam(GB_MysqlConnPool,recreate_tb); FBS9100_Task_Thread_SQL.createFBS9100SysParam_TableOnRam(GB_MysqlConnPool,recreate_tb); //创建设备状态表 //创建设备状态表 FBS9100_Task_Thread_SQL.createFBS9100SysParam_TableOnRam(GB_MysqlConnPool,recreate_tb); FBS9100_Task_Thread_SQL.insertBTSStationState_TableOnRam(GB_MysqlConnPool); //初始化录入机房状态 //初始化录入机房状态 FBS9100_Task_Thread_SQL.insertBTSStationState_TableOnRam(GB_MysqlConnPool); DB_web_site.init(GB_MysqlConnPool, recreate_tb); //初始化 web_site数据库中的表 //初始化数据库 db_battinf DB_battinf.init(GB_MysqlConnPool, recreate_tb); //初始化数据库中的表web_site DB_web_site.init(GB_MysqlConnPool, recreate_tb); if(true == m_AppConfig.getMysqlDB_RecreateEn()) {
