Administrator
2022-08-12 932c5a60e35d1b41b9bee5f1c07bb5f03edfb4d2
V2.210 edit at date 2022-07-07 lijun
1.修复单体预估容量告警检测NullPoint漏洞

V2.211 edit at date 2022-08-12 lijun
2.停电电流均衡告警检测只在常规BTS中检测
4个文件已修改
40 ■■■■ 已修改文件
BattMonitor_FBS9100S_Alarm/bin/com/version_inf/version_inf.txt 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/config.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/src/com/battalarm/DeviceAlarm_Thread_New.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/src/com/version_inf/version_inf.txt 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/bin/com/version_inf/version_inf.txt
@@ -168,4 +168,7 @@
    1.新增单体预估容量告警检测以及计算
V2.210 edit at date 2022-07-07 lijun
    1.修复单体预估容量告警检测NullPoint漏洞
    1.修复单体预估容量告警检测NullPoint漏洞
V2.211 edit at date 2022-08-12 lijun
    2.停电电流均衡告警检测只在常规BTS中检测
BattMonitor_FBS9100S_Alarm/config.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="gbk"?>
<root>
  <mysql_server_ip>192.168.10.79</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_FBS9100S_Alarm/src/com/battalarm/DeviceAlarm_Thread_New.java
@@ -145,6 +145,27 @@
                                  + " ADD COLUMN `alm_value` float NOT NULL DEFAULT '0'"
                                  + " AFTER `alm_end_time`;");
            }
            //添加指定的work_flag列(派单管理)
            res = sql.sqlMysqlQuery("SELECT * FROM information_schema.columns"
                    + " WHERE table_schema='db_alarm'"
                    + " AND table_name='tb_devalarm_data'"
                    + " AND column_name='work_flag'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + DeviceAlarmTableName
                                + " 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'"
                    + " AND table_name='tb_devalarm_data'"
                    + " AND column_name='msg_flag'");
            if(false == res.next()) {
                sql.sqlMysqlExecute("ALTER TABLE " + DeviceAlarmTableName
                                + " ADD COLUMN `msg_flag` tinyint NOT NULL DEFAULT 0;");
            }
            //----------------------------------------------------------------------------------------------//
        } catch (SQLException e) {
            e.printStackTrace();
@@ -294,7 +315,6 @@
            String sql_str2 = " INSERT INTO " + DeviceALarmHistoryTableName+"(record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type)  (SELECT record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type from "+DeviceAlarmTableName+" WHERE dev_id="+dev.dev_id+" AND alm_cleared_type!="+BattAlarmData.ALM_CLEARED_TYPE_NULL+ " AND alm_type= "+ alm_type_id+")";
            //将实时告警表中的非实时告警删除
            String sql_str3 = " DELETE FROM " + DeviceAlarmTableName+" WHERE dev_id = " + dev.dev_id+" AND alm_cleared_type != "+BattAlarmData.ALM_CLEARED_TYPE_NULL+ " AND alm_type= "+ alm_type_id;
            //System.out.println(sql_str1);
            sql_strs.add(sql_str1);
            sql_strs.add(sql_str2);
            sql_strs.add(sql_str3);
@@ -588,7 +608,7 @@
                            
                            
                            //BTS设备停电电流均衡监测
                            if(dev.dev_onlinevollow > 0) {
                            if(dev.dev_onlinevollow > 0 && dev_id/100000 == 9100) {
                                //常规BTS停电放电判断
                                FBS9100_DevData stopcurrstalarm = DeviceAlarm_Thread_New.judgedevidInorNo(m_Conn_Pool, dev_id,DeviceAlarm_Thread_New.ALM_TYPE_FBS9100_CurrBalance_ID);            //查询当前设备之前是否存在停电电流均衡告警
                                FBS9100_DevData curralarm = DeviceAlarm_Thread_New.check61850DevicePowerOffCurr(m_Conn_Pool, dev, ALM_BTS_Curr_SPACING);
@@ -647,7 +667,7 @@
                                FBS9100_DevData stopcurrstalarm = DeviceAlarm_Thread_New.judgedevidInorNo(m_Conn_Pool, dev_id,DeviceAlarm_Thread_New.ALM_TYPE_FBS9100_CurrBalance_ID);            //查询当前设备之前是否存在停电电流均衡告警
                                FBS9100_DevData curralarm = DeviceAlarm_Thread_New.check61850DevicePowerOffCurr(m_Conn_Pool, dev, ALM_BTS_Curr_SPACING);
                                if((stopcurrstalarm == null || 1 == stopcurrstalarm.alm_cleared_type) && (curralarm != null && curralarm.isAlarm)) {
                                    System.out.println("设备id:"+dev.dev_id+"新增停电均衡监测告警"+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));
                                    //System.out.println("设备id:"+dev.dev_id+"新增停电均衡监测告警"+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));
                                    long RecId = UUID.randomUUID().getLeastSignificantBits();
                                    if(0 == RecId) {
                                        RecId = UUID.randomUUID().getLeastSignificantBits();
@@ -837,7 +857,7 @@
                    float group_vol = rs.getFloat("group_vol");
                    float online_vol = rs.getFloat("online_vol");
                    isEffective = true;
                    if((group_vol - sum_vol)>ALM_BTS_VOL_SPACING) {
                    if(Math.abs(group_vol - sum_vol)>ALM_BTS_VOL_SPACING) {
                        alarm.isAlarm = true;
                    }
                //}
BattMonitor_FBS9100S_Alarm/src/com/version_inf/version_inf.txt
@@ -168,4 +168,7 @@
    1.新增单体预估容量告警检测以及计算
V2.210 edit at date 2022-07-07 lijun
    1.修复单体预估容量告警检测NullPoint漏洞
    1.修复单体预估容量告警检测NullPoint漏洞
V2.211 edit at date 2022-08-12 lijun
    2.停电电流均衡告警检测只在常规BTS中检测