~whyclj/BattMonitor_DB_Builder.git

parent: 63a3d4a9 | 补丁 | 提交 | ignore whitespace

7.'db_alarm.tb_battalarm_data_verify' 电池告警确认处理表新增 `alm_solekey` int(11) ...

Administrator

2023-08-18 ef78e43698c1ea9f69e4aaa0f640a1589b5e80c5

7.'db_alarm.tb_battalarm_data_verify'  电池告警确认处理表新增
		`alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
	8.'db_alarm.tb_devalarm_data_verify'  设备告警确认处理表新增
		`alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
	9.'db_pwrdev_alarm.tb_pwrdev_alarm_verify'  电源告警确认处理表新增
		`alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
	10.'web_site.tb_fault_upload'新增字段
		ALTER TABLE `web_site`.`tb_fault_upload`
			ADD COLUMN `alarm_num` INT NULL COMMENT '告警实时表的id' AFTER
`create_time`,
			ADD COLUMN `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源' AFTER
`alarm_num`;

8个文件已修改

	BattMonitor_DB_Builder/bin/com/database_util/DB_Alarm.class	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/bin/com/database_util/DB_Pwrdev_Alarm.class	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/bin/com/database_util/DB_web_site.class	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/database_util/DB_Alarm.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/database_util/DB_Pwrdev_Alarm.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/database_util/DB_web_site.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 BattMonitor_DB_Builder/bin/com/database_util/DB_Alarm.class

Binary files differ

 BattMonitor_DB_Builder/bin/com/database_util/DB_Pwrdev_Alarm.class

Binary files differ

 BattMonitor_DB_Builder/bin/com/database_util/DB_web_site.class

Binary files differ

 BattMonitor_DB_Builder/bin/com/version_inf/version_inf.txt

@@ -8,6 +8,17 @@
    4.创建表'db_alarm.tb_battalarm_data_verify'-电池告警确认表
    5.创建表'db_alarm.tb_devalarm_data_verify'-设备告警确认表
    6.创建表'db_pwrdev_alarm.tb_pwrdev_alarm_verify'-电源告警确认表
    7.'db_alarm.tb_battalarm_data_verify'  电池告警确认处理表新增
        `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
    8.'db_alarm.tb_devalarm_data_verify'  设备告警确认处理表新增
        `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
    9.'db_pwrdev_alarm.tb_pwrdev_alarm_verify'  电源告警确认处理表新增
        `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
    10.'web_site.tb_fault_upload'新增字段	
        ALTER TABLE `web_site`.`tb_fault_upload` 
            ADD COLUMN `alarm_num` INT NULL COMMENT '告警实时表的id' AFTER `create_time`,
            ADD COLUMN `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源' AFTER `alarm_num`;
		

V1.84 edit at date 2023-07-27
    1.删除默认的电源交流停电告警参数

 BattMonitor_DB_Builder/src/com/database_util/DB_Alarm.java

@@ -608,6 +608,7 @@
                "  `work_flag` tinyint(4) NOT NULL DEFAULT '0'," + 
                "  `msg_flag` tinyint(4) NOT NULL DEFAULT '0'," + 
                "  `alm_severity` int(11) NOT NULL DEFAULT '0' COMMENT '告警重要等级[0:重要；1:紧急]'," + 
                "  `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键'," + 
                "  PRIMARY KEY (`num`)," + 
                "  KEY `index_battgroup_id` (`BattGroupId`)," + 
                "  KEY `index_Record_Id` (`Record_Id`)," + 
@@ -625,6 +626,16 @@
            }
            sql.sqlMysqlExecute(sql_str02);
            
			
            //添加指定的highorlow列
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_alarm'"
                    + " AND table_name='tb_battalarm_data_verify'"
                    + " AND column_name='alm_solekey'");
            if(!res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Battalarm_Data_Verify_Table 
                                + "  ADD COLUMN `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键';");
            }
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
@@ -666,6 +677,7 @@
                "  `work_flag` tinyint(4) NOT NULL DEFAULT '0'," + 
                "  `msg_flag` tinyint(4) NOT NULL DEFAULT '0'," + 
                "  `alm_severity` int(11) NOT NULL DEFAULT '1' COMMENT '告警重要等级[0:重要；1:紧急]'," + 
                "  `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键'," + 
                "  PRIMARY KEY (`num`)," + 
                "  KEY `index_record_id` (`record_id`)," + 
                "  KEY `index_dev_id` (`dev_id`)," + 
@@ -681,6 +693,16 @@
            }
            sql.sqlMysqlExecute(sql_str02);
            
            //添加指定的highorlow列
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_alarm'"
                    + " AND table_name='tb_devalarm_data_verify'"
                    + " AND column_name='alm_solekey'");
            if(!res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Devalarm_Data_Verify_Table 
                                + "  ADD COLUMN `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键';");
            }
			
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {

 BattMonitor_DB_Builder/src/com/database_util/DB_Pwrdev_Alarm.java

@@ -87,6 +87,7 @@
                "  `usr_Id` int(11) NOT NULL DEFAULT '0'," + 
                "  `alm_trigger` int(11) NOT NULL DEFAULT '0' COMMENT '告警来源[0-来源于点表；1-来源于电源告警参数]'," + 
                "  `alm_severity` int(11) NOT NULL DEFAULT '0' COMMENT '告警重要等级[0:重要；1:紧急]'," + 
                "  `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键'," + 
                "  PRIMARY KEY (`num`)," + 
                "  KEY `index_record_id` (`record_id`)," + 
                "  KEY `index_pwrdev_id` (`PowerDeviceId`)," + 
@@ -95,15 +96,34 @@
                "  KEY `index_alm_cleared_type` (`alm_cleared_type`)" + 
                ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='电源告警确认处理表';";
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
        ResultSet res = null;
        try {
            if(true == recreate) {            
                sql.sqlMysqlExecute(sql_str01);
            }
            sql.sqlMysqlExecute(sql_str02);
            
            //添加 alm_source
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_pwrdev_alarm'"
                    + " AND table_name='tb_pwrdev_alarm_verify'"
                    + " AND column_name='alm_source'");
			
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Alarm_Verify_Table 
                                + " ADD COLUMN `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键';");
            }
			
        } catch (SQLException e) {
            e.printStackTrace();
        } finally {
            if(null != res) {
                try {
                    res.close();
                } catch (SQLException e) {
                    e.printStackTrace();
                }
            }
            sql.close_con();
        }
    }

 BattMonitor_DB_Builder/src/com/database_util/DB_web_site.java

@@ -5494,6 +5494,8 @@
                "  `confirm_time` datetime DEFAULT NULL," + 
                "  `status` tinyint(4) DEFAULT NULL COMMENT '0:待确认,1确认属实,-1确认不属实'," + 
                "  `create_time` datetime DEFAULT NULL," + 
                "  `alarm_num` INT NULL COMMENT '告警实时表的id'," + 
                "  `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源'," + 
                "  PRIMARY KEY (`id`)" + 
                ") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='故障隐患上传表,用于故障隐患考核';";
        Sql_Mysql sql = new Sql_Mysql(pool.getConn());
@@ -5515,6 +5517,26 @@
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Fault_Upload_Table 
                        + " ADD COLUMN `station_id` int(11) DEFAULT NULL;");
            }
            res = null;
            //添加告警实时表的id
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='web_site'"
                    + " AND table_name='tb_fault_upload'"
                    + " AND column_name='alarm_num'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Fault_Upload_Table 
                        + " ADD COLUMN `alarm_num` INT NULL COMMENT '告警实时表的id';");
            }
            res = null;
            //添加告警分类:1-电池,2-设备,3-电源
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='web_site'"
                    + " AND table_name='tb_fault_upload'"
                    + " AND column_name='alarm_type'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Fault_Upload_Table 
                        + " ADD COLUMN `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源';");
            }
            
            res = null;
            //删除列station_name

 BattMonitor_DB_Builder/src/com/version_inf/version_inf.txt

@@ -8,6 +8,17 @@
    4.创建表'db_alarm.tb_battalarm_data_verify'-电池告警确认表
    5.创建表'db_alarm.tb_devalarm_data_verify'-设备告警确认表
    6.创建表'db_pwrdev_alarm.tb_pwrdev_alarm_verify'-电源告警确认表
    7.'db_alarm.tb_battalarm_data_verify'  电池告警确认处理表新增
        `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
    8.'db_alarm.tb_devalarm_data_verify'  设备告警确认处理表新增
        `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
    9.'db_pwrdev_alarm.tb_pwrdev_alarm_verify'  电源告警确认处理表新增
        `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
    10.'web_site.tb_fault_upload'新增字段	
        ALTER TABLE `web_site`.`tb_fault_upload` 
            ADD COLUMN `alarm_num` INT NULL COMMENT '告警实时表的id' AFTER `create_time`,
            ADD COLUMN `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源' AFTER `alarm_num`;
		

V1.84 edit at date 2023-07-27
    1.删除默认的电源交流停电告警参数

			@@ -8,6 +8,17 @@
			4.创建表'db_alarm.tb_battalarm_data_verify'-电池告警确认表
			5.创建表'db_alarm.tb_devalarm_data_verify'-设备告警确认表
			6.创建表'db_pwrdev_alarm.tb_pwrdev_alarm_verify'-电源告警确认表
			7.'db_alarm.tb_battalarm_data_verify' 电池告警确认处理表新增
			`alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
			8.'db_alarm.tb_devalarm_data_verify' 设备告警确认处理表新增
			`alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
			9.'db_pwrdev_alarm.tb_pwrdev_alarm_verify' 电源告警确认处理表新增
			`alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键',
			10.'web_site.tb_fault_upload'新增字段
			ALTER TABLE `web_site`.`tb_fault_upload`
			ADD COLUMN `alarm_num` INT NULL COMMENT '告警实时表的id' AFTER `create_time`,
			ADD COLUMN `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源' AFTER `alarm_num`;


			V1.84 edit at date 2023-07-27
			1.删除默认的电源交流停电告警参数

			@@ -608,6 +608,7 @@
			" `work_flag` tinyint(4) NOT NULL DEFAULT '0'," +
			" `msg_flag` tinyint(4) NOT NULL DEFAULT '0'," +
			" `alm_severity` int(11) NOT NULL DEFAULT '0' COMMENT '告警重要等级[0:重要；1:紧急]'," +
			" `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键'," +
			" PRIMARY KEY (`num`)," +
			" KEY `index_battgroup_id` (`BattGroupId`)," +
			" KEY `index_Record_Id` (`Record_Id`)," +
			@@ -625,6 +626,16 @@
			}
			sql.sqlMysqlExecute(sql_str02);


			//添加指定的highorlow列
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_alarm'"
			+ " AND table_name='tb_battalarm_data_verify'"
			+ " AND column_name='alm_solekey'");
			if(!res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Battalarm_Data_Verify_Table
			+ " ADD COLUMN `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键';");
			}
			} catch (SQLException e) {
			e.printStackTrace();
			} finally {
			@@ -666,6 +677,7 @@
			" `work_flag` tinyint(4) NOT NULL DEFAULT '0'," +
			" `msg_flag` tinyint(4) NOT NULL DEFAULT '0'," +
			" `alm_severity` int(11) NOT NULL DEFAULT '1' COMMENT '告警重要等级[0:重要；1:紧急]'," +
			" `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键'," +
			" PRIMARY KEY (`num`)," +
			" KEY `index_record_id` (`record_id`)," +
			" KEY `index_dev_id` (`dev_id`)," +
			@@ -681,6 +693,16 @@
			}
			sql.sqlMysqlExecute(sql_str02);

			//添加指定的highorlow列
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_alarm'"
			+ " AND table_name='tb_devalarm_data_verify'"
			+ " AND column_name='alm_solekey'");
			if(!res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Devalarm_Data_Verify_Table
			+ " ADD COLUMN `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键';");
			}

			} catch (SQLException e) {
			e.printStackTrace();
			} finally {

			@@ -87,6 +87,7 @@
			" `usr_Id` int(11) NOT NULL DEFAULT '0'," +
			" `alm_trigger` int(11) NOT NULL DEFAULT '0' COMMENT '告警来源[0-来源于点表；1-来源于电源告警参数]'," +
			" `alm_severity` int(11) NOT NULL DEFAULT '0' COMMENT '告警重要等级[0:重要；1:紧急]'," +
			" `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键'," +
			" PRIMARY KEY (`num`)," +
			" KEY `index_record_id` (`record_id`)," +
			" KEY `index_pwrdev_id` (`PowerDeviceId`)," +
			@@ -95,15 +96,34 @@
			" KEY `index_alm_cleared_type` (`alm_cleared_type`)" +
			") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='电源告警确认处理表';";
			Sql_Mysql sql = new Sql_Mysql(pool.getConn());
			ResultSet res = null;
			try {
			if(true == recreate) {
			sql.sqlMysqlExecute(sql_str01);
			}
			sql.sqlMysqlExecute(sql_str02);

			//添加 alm_source
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='db_pwrdev_alarm'"
			+ " AND table_name='tb_pwrdev_alarm_verify'"
			+ " AND column_name='alm_source'");

			if(false == res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Pwrdev_Alarm_Verify_Table
			+ " ADD COLUMN `alm_solekey` int(11) NOT NULL DEFAULT '1' COMMENT '实时告警主键';");
			}

			} catch (SQLException e) {
			e.printStackTrace();
			} finally {
			if(null != res) {
			try {
			res.close();
			} catch (SQLException e) {
			e.printStackTrace();
			}
			}
			sql.close_con();
			}
			}

			@@ -5494,6 +5494,8 @@
			" `confirm_time` datetime DEFAULT NULL," +
			" `status` tinyint(4) DEFAULT NULL COMMENT '0:待确认,1确认属实,-1确认不属实'," +
			" `create_time` datetime DEFAULT NULL," +
			" `alarm_num` INT NULL COMMENT '告警实时表的id'," +
			" `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源'," +
			" PRIMARY KEY (`id`)" +
			") ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='故障隐患上传表,用于故障隐患考核';";
			Sql_Mysql sql = new Sql_Mysql(pool.getConn());
			@@ -5515,6 +5517,26 @@
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Fault_Upload_Table
			+ " ADD COLUMN `station_id` int(11) DEFAULT NULL;");
			}
			res = null;
			//添加告警实时表的id
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='web_site'"
			+ " AND table_name='tb_fault_upload'"
			+ " AND column_name='alarm_num'");
			if(false == res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Fault_Upload_Table
			+ " ADD COLUMN `alarm_num` INT NULL COMMENT '告警实时表的id';");
			}
			res = null;
			//添加告警分类:1-电池,2-设备,3-电源
			res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
			+ " WHERE table_schema='web_site'"
			+ " AND table_name='tb_fault_upload'"
			+ " AND column_name='alarm_type'");
			if(false == res.next()) {
			sql.sqlMysqlExecute("ALTER TABLE " + Sql_Mysql.Tb_Fault_Upload_Table
			+ " ADD COLUMN `alarm_type` INT NULL COMMENT '告警分类:1-电池,2-设备,3-电源';");
			}

			res = null;
			//删除列station_name