BattMonitor_FBS9100S_Alarm/bin/com/battalarm/BattAlarm_Thread.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battalarm/BattAlarm_Thread_New.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battalarm/BattAlarm_Thread_New2.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battalarm/DeviceAlarm_Thread.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battalarm/DeviceAlarm_Thread_New.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battalarm/DeviceAlarm_Thread_New2.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battdata_rt/BattData_RT.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battdata_rt/BattStatData.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/com/comm/Socket_Server$CommData.classBinary files differ
BattMonitor_FBS9100S_Alarm/bin/main/main_FBS9100S_Alarm.classBinary files differ
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>192.168.10.82</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/BattAlarm_Thread_New2.java
@@ -53,6 +53,9 @@ for(int i=0;i<m_AL_Data.getItemCount();i++){ //System.out.println(m_AL_Data.getItem(i).FBSDeviceId); //给每个电池组设置不同的告警参数 getBattAlarmParam(m_Conn_Pool.getConn(),m_AL_Data.getItem(i)); //System.err.println(m_AL_Data.getItem(i).m_BattAlarmParam.alm_BattDisChargeCurr); } //创建tb_alarm_param表 (老的 ->所有设备使用相同的告警参数) @@ -193,7 +196,7 @@ } if(null != param) { param.alm_Id = res.getInt("alm_id"); param.alm_Name = res.getString("alm_name"); param.alm_High = res.getFloat("alm_high_coe"); param.alm_Low = res.getFloat("alm_low_coe"); @@ -214,6 +217,7 @@ //System.err.println(param); } flag = true; } if(!ALM_TYPE_OnlineVol_Init) { @@ -715,6 +719,9 @@ updateBattParamAlarm(m_Conn_Pool,alm_data); } } }else if(last_alarm != null && last_alarm.alm_cleared_type == BattAlarmData.ALM_CLEARED_TYPE_MANUAL){ //若数据库中已存在当前类型的取消的告警也不插入数据库中 }else{ //System.out.println("新告警记录"+alm_data.alm_cleared_type); insertNewBattRealAlarm(m_Conn_Pool, alm_data); //插入新的告警记录 @@ -1247,11 +1254,11 @@ }break; //电池放电电流 case BattAlarmData.ALM_TYPE_BattDisChargeCurr_ID:{ battdata.TestData.battCurr_AlarmData.alm_signal_id = alarm.alm_signal_id; battdata.TestData.battCurr_AlarmData.alm_cleared_type = alarm.alm_cleared_type; battdata.TestData.battCurr_AlarmData.alm_severity = alarm.alm_severity; battdata.TestData.battCurr_AlarmData.alm_signal_level = alarm.alm_signal_level; battdata.TestData.battCurr_AlarmData.alm_start_time = alarm.alm_start_time; battdata.TestData.battDisCurr_AlarmData.alm_signal_id = alarm.alm_signal_id; battdata.TestData.battDisCurr_AlarmData.alm_cleared_type = alarm.alm_cleared_type; battdata.TestData.battDisCurr_AlarmData.alm_severity = alarm.alm_severity; battdata.TestData.battDisCurr_AlarmData.alm_signal_level = alarm.alm_signal_level; battdata.TestData.battDisCurr_AlarmData.alm_start_time = alarm.alm_start_time; }break; //电池放电单体电压 case BattAlarmData.ALM_TYPE_DisChargeMonVol_ID:{ BattMonitor_FBS9100S_Alarm/src/com/battdata_rt/BattData_RT.java
@@ -421,7 +421,7 @@ } else { TestData.battCurr_AlarmData.makeAlarmData(al_alm_data, m_AlarmParam.alm_BattDisChargeCurr, TestData.testCurr); TestData.battDisCurr_AlarmData.makeAlarmData(al_alm_data, m_AlarmParam.alm_BattDisChargeCurr, Math.abs(TestData.testCurr)); } for(int n=0; n<al_MonVol.size(); n++) BattMonitor_FBS9100S_Alarm/src/com/battdata_rt/BattStatData.java
@@ -86,6 +86,7 @@ public BattAlarmData onlineVol_AlarmData; public BattAlarmData groupVol_AlarmData; public BattAlarmData battCurr_AlarmData; public BattAlarmData battDisCurr_AlarmData; //--------------------------------// public BattStatData(int type, boolean syb_srv_curr_charge_dir_pos) { @@ -110,6 +111,11 @@ battgroup_id, 0, BattAlarmData.ALM_TYPE_BattChargeCurr_ID, BattAlarmData.ALM_SIGNAL_ID_ChargeCurrHigh, BattAlarmData.ALM_SIGNAL_ID_ChargeCurrLow, param.alm_BattChargeCurr.alm_High_Level, param.alm_BattChargeCurr.alm_Low_Level,BattAlarmData.Alm_Severity_Importance); battDisCurr_AlarmData = new BattAlarmData(dt_count_max, battgroup_id, 0, BattAlarmData.ALM_TYPE_BattDisChargeCurr_ID, BattAlarmData.ALM_SIGNAL_ID_DisChargeCurrHigh, BattAlarmData.ALM_SIGNAL_ID_DisChargeCurrLow, param.alm_BattDisChargeCurr.alm_High_Level, param.alm_BattDisChargeCurr.alm_Low_Level,BattAlarmData.Alm_Severity_Importance); } public void setBattFloatCurrLevel(float curr_level) BattMonitor_FBS9100S_Alarm/src/com/version_inf/version_inf.txt
@@ -14,10 +14,14 @@ 119012 单体漏液电压告警 随时生效 119013 单体预估容量告警 随时生效 V2.219 edit at date 2023-09-25 1.修复电池放电电流告警和充点电流告警bug 2.修复电池告警取消告警后会无限插入n条实时告警记录 V2.218 edit at date 2023-09-07 1.修复将设备历史告警插入历史告警分表时没有同时插入是否紧急标识bug 2.修复历史告警分表时会删除同类型的告警记录 3.61850设备在核容过程中不检测单体电压告警 V2.217 edit at date 2023-08-18 1.电池告警新增逻辑 - 电池告警消失时若配置[并且是上上限以及下下限告警]不允许自动消失，将当前历史告警移动到电池告警确认表，客户确认后方进入电池历史告警记录表 BattMonitor_FBS9100S_Alarm/src/main/main_FBS9100S_Alarm.java
@@ -38,7 +38,7 @@ /**************************************************************************/ /**************************************************************************/ public final static boolean app_debug = false; public final static float m_VersionNum = (float) 2.218; public final static float m_VersionNum = (float) 2.219; public final static String m_Version = "Welcome To Use FBS9100S Alarm Mornitor V" + m_VersionNum + " RC_20170505"; /**************************************************************************/ /**************************************************************************/
