~whyclj/BattMonitor_DB_Builder.git

parent: abffbf4d | 补丁 | 提交 | ignore whitespace

V1.37 edit at date 2022-08-09 1.默认创建'db_pwrdev_data_rt.tb_pwrdev_event'表用于...

Administrator

2022-08-09 01218fde055b6fcd55f2820caa20cf9dd0c6d7e3

V1.37 edit at date 2022-08-09
	1.默认创建'db_pwrdev_data_rt.tb_pwrdev_event'表用于记录山西61850设备的交流输入1/2的状态切换记录

7个文件已修改

	BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/config.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/database_util/DB_Alarm.java	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/database_util/DB_Pwrdev_Data_Rt.java	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt

@@ -642,5 +642,6 @@
          PRIMARY KEY (`num`)
        ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
                            
		
V1.37 edit at date 2022-08-09
    1.默认创建'db_pwrdev_data_rt.tb_pwrdev_event'表用于记录山西61850设备的交流输入1/2的状态切换记录
        

 BattMonitor_DB_Builder/config.xml

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

<root>
  <mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
  <mysql_server_ip>192.168.10.79</mysql_server_ip>
  <mysql_server_ip>192.168.10.80</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_Alarm.java

@@ -68,14 +68,32 @@
                "  KEY index_alm_cleared_type (alm_cleared_type)" + 
                ") ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;";
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        ResultSet res = null;
        try {
            if(true == recreate) {            
                sql.sqlMysqlExecute(sql_str01);
            }
            sql.sqlMysqlExecute(sql_str02);		
            sql.sqlMysqlExecute(sql_str02);
			
            //添加指定的alm_value列'告警值'
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_alarm'"
                    + " AND table_name='tb_devalarm_data_history'"
                    + " AND column_name='alm_value'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Devalarm_Data__History_Table 
                                + " ADD COLUMN alm_value float NOT NULL DEFAULT '0';");
            }
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
            if(null != res) {
                try {
                    res.close();
                } catch (SQLException e) {
                    e.printStackTrace();
                }
            }
            sql.close_con();
        }
    }
@@ -116,6 +134,16 @@
            }
            sql.sqlMysqlExecute(sql_str02);    
            
            //添加指定的alm_value列'告警值'
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_alarm'"
                    + " AND table_name='tb_devalarm_data'"
                    + " AND column_name='alm_value'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Devalarm_Data_Table 
                                + " ADD COLUMN alm_value float NOT NULL DEFAULT '0';");
            }
            res = null;

            //添加指定的work_flag列(派单管理)
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
@@ -126,7 +154,7 @@
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Devalarm_Data_Table 
                                + " ADD COLUMN `work_flag` tinyint NOT NULL DEFAULT 0;");
            }
			
            res = null;
            //添加指定的msg_flag列(派单管理)
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_alarm'"

 BattMonitor_DB_Builder/src/com/database_util/DB_Pwrdev_Data_Rt.java

@@ -15,6 +15,8 @@
        createPwrdev_Acdcdata_Table(pool, recreate);

        

        createPwrdev_Dcdata_Table(pool, recreate);

		
        createPwrdev_Event_Table(pool,recreate);

    }



    /**

@@ -2111,6 +2113,30 @@
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Acdcdata_Table 

                        + " ADD COLUMN `acIn2_currC` float NOT NULL DEFAULT '0';");

            }

			
            //添加acIn1_switch_st字段

            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"

                    + " WHERE table_schema='db_pwrdev_data_rt'"

                    + " AND table_name='tb_pwrdev_acdcdata'"

                    + " AND column_name='acIn1_switch_st'");

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

                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Acdcdata_Table 
                        + " ADD COLUMN `acIn1_switch_st` int(11) NOT NULL DEFAULT '0' COMMENT '交流输入1分合闸状态:0---未知(用于兼容以前的)，1-分闸，2-合闸，3-脱扣',;");

            }

			
            //添加acIn2_switch_st字段

            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"

                    + " WHERE table_schema='db_pwrdev_data_rt'"

                    + " AND table_name='tb_pwrdev_acdcdata'"

                    + " AND column_name='acIn2_switch_st'");

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

                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Acdcdata_Table 
                        + " ADD COLUMN `acIn2_switch_st` int(11) NOT NULL DEFAULT '0' COMMENT '交流输入2分合闸状态    :0---未知(用于兼容以前的)，1-分闸，2-合闸，3-脱扣',;");

            }

		  


			
			
        } catch (SQLException e) {

            e.printStackTrace();

        } finally {

@@ -2180,6 +2206,36 @@
    }

    

    /**

     *     创建   tb_pwrdev_event 表

     * @param pool

     * @param recreate

     */

    public static void createPwrdev_Event_Table(MysqlConnPool pool, boolean recreate) {

        String sql_str01 = " DROP TABLE IF EXISTS "+Sql_Mysql.Pwrdev_Event_Table;

        String sql_str02 = "CREATE TABLE IF NOT EXISTS " + Sql_Mysql.Pwrdev_Event_Table + " (" + 
                "  `num` bigint(20) NOT NULL AUTO_INCREMENT," + 
                "  `power_device_id` int(11) NOT NULL DEFAULT '0' COMMENT '电源ID'," + 
                "  `record_time` datetime NOT NULL DEFAULT '2000-01-01 00:00:00' COMMENT '记录事件'," + 
                "  `now_state` int(11) NOT NULL DEFAULT '0' COMMENT '当前状态'," + 
                "  `last_state` int(11) NOT NULL DEFAULT '0' COMMENT '上一次状态'," + 
                "  `event_type` int(11) NOT NULL DEFAULT '0' COMMENT '事件类型'," + 
                "  `event_txt` text NOT NULL COMMENT '事件描述'," + 
                "  PRIMARY KEY (`num`)" + 
                ") ENGINE=InnoDB AUTO_INCREMENT=246 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();

        }

    }

	
    /**

     *     创建   tb_pwrdev_acdata 表

     * @param pool

     * @param recreate


 BattMonitor_DB_Builder/src/com/sql/Sql_Mysql.java

@@ -299,6 +299,7 @@
    public final static String Pwrdev_Acdcdata_Table = DB_PWRDEV_DATA_RT + ".`tb_pwrdev_acdcdata`";
    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`";
    public final static String Pwrdev_Event_Table = DB_PWRDEV_DATA_RT + ".`tb_pwrdev_event`";
    
     /***************************** db_pwrdev_inf 数据库  ************************************/
    public final static String Pwrdev_Inf_Table = DB_PWRDEV_INF + ".`tb_pwrdev_inf`";

 BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt

@@ -642,5 +642,6 @@
          PRIMARY KEY (`num`)
        ) ENGINE=MEMORY DEFAULT CHARSET=utf8;
                            
		
V1.37 edit at date 2022-08-09
    1.默认创建'db_pwrdev_data_rt.tb_pwrdev_event'表用于记录山西61850设备的交流输入1/2的状态切换记录
        

 BattMonitor_DB_Builder/src/main/main_BTS_DB_Builder.java

@@ -30,7 +30,7 @@
    /**************************************************************************/
    /**************************************************************************/
    public final static boolean app_debug = false;
    public final static float m_VersionNum = (float) 1.36;
    public final static float m_VersionNum = (float) 1.37;
    public final static String m_Version = "Welcome To Use BTS DB BUILDER V" + m_VersionNum + " RC_20180908";
    /**************************************************************************/
    /**************************************************************************/

			@@ -642,5 +642,6 @@
			PRIMARY KEY (`num`)
			) ENGINE=MEMORY DEFAULT CHARSET=utf8;


			V1.37 edit at date 2022-08-09
			1.默认创建'db_pwrdev_data_rt.tb_pwrdev_event'表用于记录山西61850设备的交流输入1/2的状态切换记录

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

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

			@@ -68,14 +68,32 @@
			" KEY index_alm_cleared_type (alm_cleared_type)" +
			") ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;";
			Sql_Mysql sql = new Sql_Mysql(pool.getConn());
			ResultSet res = null;
			try {
			if(true == recreate) {
			sql.sqlMysqlExecute(sql_str01);
			}
			sql.sqlMysqlExecute(sql_str02);
			sql.sqlMysqlExecute(sql_str02);

			//添加指定的alm_value列'告警值'
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_alarm'"
			+ " AND table_name='tb_devalarm_data_history'"
			+ " AND column_name='alm_value'");
			if(false == res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Devalarm_Data__History_Table
			+ " ADD COLUMN alm_value float NOT NULL DEFAULT '0';");
			}
			} catch (SQLException e) {
			e.printStackTrace();
			} finally {
			if(null != res) {
			try {
			res.close();
			} catch (SQLException e) {
			e.printStackTrace();
			}
			}
			sql.close_con();
			}
			}
			@@ -116,6 +134,16 @@
			}
			sql.sqlMysqlExecute(sql_str02);

			//添加指定的alm_value列'告警值'
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_alarm'"
			+ " AND table_name='tb_devalarm_data'"
			+ " AND column_name='alm_value'");
			if(false == res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Devalarm_Data_Table
			+ " ADD COLUMN alm_value float NOT NULL DEFAULT '0';");
			}
			res = null;

			//添加指定的work_flag列(派单管理)
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			@@ -126,7 +154,7 @@
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Devalarm_Data_Table
			+ " ADD COLUMN `work_flag` tinyint NOT NULL DEFAULT 0;");
			}

			res = null;
			//添加指定的msg_flag列(派单管理)
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_alarm'"

			@@ -15,6 +15,8 @@
			createPwrdev_Acdcdata_Table(pool, recreate);

			createPwrdev_Dcdata_Table(pool, recreate);

			createPwrdev_Event_Table(pool,recreate);
			}

			/**
			@@ -2111,6 +2113,30 @@
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Acdcdata_Table
			+ " ADD COLUMN `acIn2_currC` float NOT NULL DEFAULT '0';");
			}

			//添加acIn1_switch_st字段
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_pwrdev_data_rt'"
			+ " AND table_name='tb_pwrdev_acdcdata'"
			+ " AND column_name='acIn1_switch_st'");
			if(false == res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Acdcdata_Table
			+ " ADD COLUMN `acIn1_switch_st` int(11) NOT NULL DEFAULT '0' COMMENT '交流输入1分合闸状态:0---未知(用于兼容以前的)，1-分闸，2-合闸，3-脱扣',;");
			}

			//添加acIn2_switch_st字段
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_pwrdev_data_rt'"
			+ " AND table_name='tb_pwrdev_acdcdata'"
			+ " AND column_name='acIn2_switch_st'");
			if(false == res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Acdcdata_Table
			+ " ADD COLUMN `acIn2_switch_st` int(11) NOT NULL DEFAULT '0' COMMENT '交流输入2分合闸状态 :0---未知(用于兼容以前的)，1-分闸，2-合闸，3-脱扣',;");
			}




			} catch (SQLException e) {
			e.printStackTrace();
			} finally {
			@@ -2180,6 +2206,36 @@
			}

			/**
			* 创建 tb_pwrdev_event 表
			* @param pool
			* @param recreate
			*/
			public static void createPwrdev_Event_Table(MysqlConnPool pool, boolean recreate) {
			String sql_str01 = " DROP TABLE IF EXISTS "+Sql_Mysql.Pwrdev_Event_Table;
			String sql_str02 = "CREATE TABLE IF NOT EXISTS " + Sql_Mysql.Pwrdev_Event_Table + " (" +
			" `num` bigint(20) NOT NULL AUTO_INCREMENT," +
			" `power_device_id` int(11) NOT NULL DEFAULT '0' COMMENT '电源ID'," +
			" `record_time` datetime NOT NULL DEFAULT '2000-01-01 00:00:00' COMMENT '记录事件'," +
			" `now_state` int(11) NOT NULL DEFAULT '0' COMMENT '当前状态'," +
			" `last_state` int(11) NOT NULL DEFAULT '0' COMMENT '上一次状态'," +
			" `event_type` int(11) NOT NULL DEFAULT '0' COMMENT '事件类型'," +
			" `event_txt` text NOT NULL COMMENT '事件描述'," +
			" PRIMARY KEY (`num`)" +
			") ENGINE=InnoDB AUTO_INCREMENT=246 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();
			}
			}

			/**
			* 创建 tb_pwrdev_acdata 表
			* @param pool
			* @param recreate

			@@ -299,6 +299,7 @@
			public final static String Pwrdev_Acdcdata_Table = DB_PWRDEV_DATA_RT + ".`tb_pwrdev_acdcdata`";
			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`";
			public final static String Pwrdev_Event_Table = DB_PWRDEV_DATA_RT + ".`tb_pwrdev_event`";

			/*************************** db_pwrdev_inf 数据库 **********************************/
			public final static String Pwrdev_Inf_Table = DB_PWRDEV_INF + ".`tb_pwrdev_inf`";

			@@ -30,7 +30,7 @@
			/**************************************************************************/
			/**************************************************************************/
			public final static boolean app_debug = false;
			public final static float m_VersionNum = (float) 1.36;
			public final static float m_VersionNum = (float) 1.37;
			public final static String m_Version = "Welcome To Use BTS DB BUILDER V" + m_VersionNum + " RC_20180908";
			/**************************************************************************/
			/**************************************************************************/