whyclj
2020-06-09 7ce243ef4ad04bf8b8bdf9c03be86985a0a56cbd
添加61850干接点告警
4个文件已修改
47 ■■■■■ 已修改文件
BattMonitor_FBS9100S_Alarm/bin/.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/src/com/battalarm/DeviceAlarm_Thread_New.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/src/com/version_inf/version_inf.txt 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/src/main/main_FBS9100S_Alarm.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/bin/.gitignore
@@ -1 +1,2 @@
/com/
/main/
BattMonitor_FBS9100S_Alarm/src/com/battalarm/DeviceAlarm_Thread_New.java
@@ -23,29 +23,29 @@
    public final static String LD9_StateTableName = Sql_Mysql.DB_RamDB+".`tb_ld9_state`";        //LD9设备状态表
    
    public final static String Fbs9100_State="tb_fbs9100_state";
    public final static int ALM_TYPE_FBS9100_CommError_ID          = 119020;            //BTS通讯故障
    public final static int ALM_TYPE_FBS9600_CommError_ID          = 119021;
    public final static int ALM_TYPE_BPM7100_CommError_ID          = 119022;
    public final static int ALM_TYPE_CInterface_CommError_ID     = 119031;
    public final static int ALM_TYPE_FBS9100_CommError_ID              = 119020;            //BTS通讯故障
    public final static int ALM_TYPE_FBS9600_CommError_ID              = 119021;
    public final static int ALM_TYPE_BPM7100_CommError_ID              = 119022;
    public final static int ALM_TYPE_CInterface_CommError_ID         = 119031;
    
    public final static int ALM_TYPE_BTS_ENDURANCE_ID              = 119023;            //BTS续航告警
    public final static int ALM_TYPE_FBS9100_POWEROFF_ID          = 119024;            //机房停电告警
    public final static int ALM_TYPE_FBS9100_FADIAN_ID              = 119025;            //机房发电告警
    public final static int ALM_TYPE_FBS9100_DIAOZHAN_ID          = 119026;            //机房掉站告警
    public final static int ALM_TYPE_FBS9100_KAIMEN_ID              = 119027;            //机房开门告警
    public final static int ALM_TYPE_BTS_ENDURANCE_ID                  = 119023;            //BTS续航告警
    public final static int ALM_TYPE_FBS9100_POWEROFF_ID              = 119024;            //机房停电告警
    public final static int ALM_TYPE_FBS9100_FADIAN_ID                  = 119025;            //机房发电告警
    public final static int ALM_TYPE_FBS9100_DIAOZHAN_ID              = 119026;            //机房掉站告警
    public final static int ALM_TYPE_FBS9100_KAIMEN_ID                  = 119027;            //机房开门告警
    
    public final static int ALM_TYPE_FBS9100_TMPHIGHT_ID         = 119028;            //设备高温告警
    public final static int ALM_TYPE_FBS9100_TMPHIGHT_ID             = 119028;            //设备高温告警
    
    public final static int ALM_TYPE_FBS9100_SDERROR_ID         = 119032;            //设备SD卡故障
    public final static int ALM_TYPE_FBS9100_SDERROR_ID             = 119032;            //设备SD卡故障
    
    public final static int ALM_TYPE_FBS9100_COLLECTERROR_ID    = 119033;            //采集线告警
    public final static int ALM_TYPE_FBS9100_COLLECTERROR_ID        = 119033;            //采集线告警
    
    
    public final static int ALM_TYPE_BTS61850_RELAY_Error_ID     = 618501;            //继电器告警
    public final static int ALM_TYPE_BTS61850_CONNCET_Error_ID     = 618502;            //通讯告警
    public final static int ALM_TYPE_BTS61850_HIGTMP_Error_ID     = 618503;            //设备过温告警
    public final static int ALM_TYPE_BTS61850_DIODE_Error_ID     = 618504;            //二极管D1告警
    public final static int ALM_TYPE_BTS61850_RELAY_Error_ID         = 618501;            //继电器告警
    public final static int ALM_TYPE_BTS61850_CONNCET_Error_ID         = 618502;            //通讯告警
    public final static int ALM_TYPE_BTS61850_HIGTMP_Error_ID         = 618503;            //设备过温告警
    public final static int ALM_TYPE_BTS61850_DIODE_Error_ID         = 618504;            //二极管D1告警
    public final static int ALM_TYPE_BTS61850_DRYCONTACT_Error_ID     = 618505;            //干接点告警
    
    public final static int ALM_BTS_TMP_HIGHT_VALUE = 50;                            //设备温度告警
    public final static int ALM_BTS_CURR_MAX_VALUE = 3;                                //辨别采集线告警时的最大有效电流
@@ -63,7 +63,8 @@
                        ALM_TYPE_BTS61850_RELAY_Error_ID,
                        ALM_TYPE_BTS61850_CONNCET_Error_ID,
                        ALM_TYPE_BTS61850_HIGTMP_Error_ID,
                        ALM_TYPE_BTS61850_DIODE_Error_ID
                        ALM_TYPE_BTS61850_DIODE_Error_ID,
                        ALM_TYPE_BTS61850_DRYCONTACT_Error_ID
                    }; 
    
    public final static int time_interval=180;                            //设备通讯告警超时时长(秒)
@@ -579,7 +580,7 @@
                            //61850设备告警
                            for(int k=0;k<ALM_BTS61851_TYPEIDS.length;k++){
                                FBS9100_DevData dev61850Data = DeviceAlarm_Thread_New.judgedevidInorNo(m_Conn_Pool, dev_id , ALM_BTS61851_TYPEIDS[k]);
                                if((dev61850Data == null || dev61850Data.RecId == 0) && (dev.alarms_Flag.length >= 4) && (("true").equals(dev.alarms_Flag[k].trim()))){
                                if((dev61850Data == null || dev61850Data.RecId == 0) && (dev.alarms_Flag.length >= ALM_BTS61851_TYPEIDS.length) && (("true").equals(dev.alarms_Flag[k].trim()))){
                                    long myrecId = UUID.randomUUID().getLeastSignificantBits();
                                    if(0 == myrecId) {
                                        myrecId = UUID.randomUUID().getLeastSignificantBits();
@@ -588,7 +589,7 @@
                                    DeviceAlarm_Thread_New.insertOrUpdateDevAlarmToTable(m_Conn_Pool, myrecId, dev_id, dev_ip,
                                                                                        ALM_BTS61851_TYPEIDS[k],FIRST_ALM_LEVEL,ALM_DEVICE_DEFAULT_VALUE, true);
                                }else{
                                    if((dev61850Data != null && dev61850Data.RecId != 0) && (dev.alarms_Flag.length >= 4) && (("false").equals(dev.alarms_Flag[k].trim()))){
                                    if((dev61850Data != null && dev61850Data.RecId != 0) && (dev.alarms_Flag.length >= ALM_BTS61851_TYPEIDS.length) && (("false").equals(dev.alarms_Flag[k].trim()))){
                                        //System.out.println("dev_id:"+dev.dev_id+"\t alm_type:"+ALM_BTS61851_TYPEIDS[k]);
                                        makeRealAlarmToHistoryAlarm(m_Conn_Pool,list.get(i),ALM_BTS61851_TYPEIDS[k]);            //将实时告警记录变成历史告警记录
                                    }
BattMonitor_FBS9100S_Alarm/src/com/version_inf/version_inf.txt
@@ -148,4 +148,7 @@
    
V2.203 edit at date 2019-10-30 lijun
    1.在设备告警中添加9度设备的通信告警
V2.204 edit at date 2020-06-09 lijun
    1.设备告警中添加干接点告警
    
BattMonitor_FBS9100S_Alarm/src/main/main_FBS9100S_Alarm.java
@@ -27,7 +27,7 @@
    /**************************************************************************/
    /**************************************************************************/
    public final static boolean app_debug = false;
    public final static float m_VersionNum = (float) 2.203;
    public final static float m_VersionNum = (float) 2.204;
    public final static String m_Version = "Welcome To Use FBS9100S Alarm Mornitor V" + m_VersionNum + " RC_20170505";
    /**************************************************************************/
    /**************************************************************************/