tb_battinf表中添加机房是否安装列

LiJun

2018-10-26 8bfc99d231cf771ce4b258845c15599a0570eff7

tb_battinf表中添加机房是否安装列

 BattMonitor_DB_Builder/bin/.gitignore

@@ -1 +1,2 @@
/com/
/main/

 BattMonitor_DB_Builder/bin/com/dev/fbs9100/FBS9100_Task_Thread_SQL.class

Binary files differ

 BattMonitor_DB_Builder/bin/com/sql/Sql_Mysql.class

Binary files differ

 BattMonitor_DB_Builder/bin/main/main_BTS_DB_Builder.class

Binary files differ

 BattMonitor_DB_Builder/config.xml

@@ -2,7 +2,7 @@

<root>
  <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
  <mysql_server_ip>123.207.82.239</mysql_server_ip>
  <mysql_server_ip>127.0.0.1</mysql_server_ip>
  <!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
  <!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
  <!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->

 BattMonitor_DB_Builder/src/com/dev/fbs9100/FBS9100_Task_Thread_SQL.java

@@ -1,6 +1,9 @@
package com.dev.fbs9100;



import java.sql.ResultSet;

import java.sql.SQLException;



import javax.net.ssl.HandshakeCompletedEvent;



import com.sql.MysqlConnPool;

import com.sql.Sql_Mysql;

@@ -54,7 +57,7 @@
                    + "`dev_station_poff_tlong` INT NOT NULL DEFAULT 0, "                //停电时长

                    + "`dev_station_poff_cnt` INT NOT NULL DEFAULT 0, "                    //停电次数

                    + "`dev_data_flowsum` BIGINT NOT NULL DEFAULT 0, "                    //机房流量

                    + "`dev_station_state` INT NOT NULL DEFAULT 0, "					
                    + "`batt_online_state` INT NOT NULL DEFAULT 0, "                    //电池状态(0:闭合,1：断开)				
                    

                    + " UNIQUE INDEX index_dev_id_uniq (`dev_id`), "

                    + " PRIMARY KEY (`num`) ) "

@@ -237,4 +240,46 @@
            sql.close_con();

        }

    }



    /**

     *     插入在机房状态表中未添加机房状态的记录

     * @param gB_MysqlConnPool

     */

    public static void insertBTSStationState_TableOnRam(MysqlConnPool con_pool) {

        //查询没有添加机房状态的机房记录

        String sql_str1 = " SELECT DISTINCT StationId,FBSDeviceId " + 
                          " FROM " + Sql_Mysql.BattInf_Table + 
                          "    WHERE StationId NOT IN( " + 
                          "        SELECT station_id " + 
                          "        FROM  "+ Sql_Mysql.BTSStationState_Table + 
                          ")";

        //添加机房状态的记录

        String sql_str2 = " INSERT INTO " + Sql_Mysql.BTSStationState_Table + "(dev_id,station_id) VALUES ";

		
        Sql_Mysql sql = new Sql_Mysql(con_pool.getConn());

        ResultSet rs = null;

        try {

            rs= sql.sqlMysqlQuery(sql_str1);

            System.out.println(sql_str1);

            boolean hasInsertStation = false;;

            while(rs.next()) {

                int dev_id = rs.getInt("FBSDeviceId");

                int stationid = rs.getInt("StationId");

                if( !hasInsertStation ) {

                    sql_str2 = sql_str2 + "(" + dev_id + "," + stationid + ")";

                    hasInsertStation = true;

                }else {

                    sql_str2 = sql_str2 + ",(" + dev_id + "," + stationid + ")";

                }				
            }

            if(hasInsertStation) {

                //System.out.println(sql_str2);

                sql.sqlMysqlExecute(sql_str2);

            }

        } catch (SQLException e) {

            e.printStackTrace();

        } finally {

            sql.close_con();

        }		
    }

}


 BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java

@@ -525,6 +525,18 @@
                        }

                        

                //---------------------------------------------------------------------------------------------//

                //-------------------------------- 2018-10-16 by lijun   (  binf表中添加   station_install->标识机房是否已经安装 )------------------------------------//		
                        res = sqlMysqlQuery("SELECT * FROM information_schema.columns"

                                + " WHERE table_schema='db_battinf'"

                                + " AND table_name='tb_battinf'"

                                + " AND column_name='station_install'");

                        if(false == res.next()) {

                            sqlMysqlExecute("ALTER TABLE " + BattInf_Table 
                                            + " ADD COLUMN `station_install` BOOLEAN NOT NULL DEFAULT false");

                        }

						
                //---------------------------------------------------------------------------------------------//

			
                        

                        

        //---------------------------------------------------------------------------------------------//


 BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java

@@ -83,6 +83,9 @@
            FBS9100_Task_Thread_SQL.createBTSStationState_TableOnRam(GB_MysqlConnPool);
        }
        
        FBS9100_Task_Thread_SQL.insertBTSStationState_TableOnRam(GB_MysqlConnPool);                    //初始化录入机房状态

		
		
        if(true == m_AppConfig.getMysqlDB_RecreateEn()) {
            m_AppConfig.setMysqlDB_RecreateEn(false);
            m_AppConfig.writeConfigToXml();