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/BattDevHistory_SubtableThread_SQL.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/battalarm/FBS9100_DevData.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/src/com/battalarm/BattDevHistory_SubtableThread_SQL.java
@@ -42,6 +42,7 @@ alm.alm_is_confirmed = res.getBoolean("alm_is_confirmed"); alm.alm_confirmed_Time = res.getTimestamp("alm_confirmed_time"); alm.alm_cleared_type = res.getInt("alm_cleared_type"); alm.alm_severity = res.getInt("alm_severity"); battAlarms.add(alm); } @@ -89,6 +90,8 @@ alm.alm_cleared_type = res.getInt("alm_cleared_type"); alm.alm_severity = res.getInt("alm_severity"); devAlmDatas.add(alm); } } catch (SQLException e) { @@ -115,7 +118,7 @@ createBattHistoryTable(pool, alm); //创建分表记录表 String sql_str_ins = " INSERT INTO " + Sql_Mysql.Tb_Battalarm_Data_History + Com.getDateTimeFormat(alm.alm_start_time, Com.DTF_YM) + "(BattGroupId,MonNum,Record_Id,alm_id,alm_signal_id,alm_level,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type) " + "(BattGroupId,MonNum,Record_Id,alm_id,alm_signal_id,alm_level,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity) " + " values(" + alm.battgroup_id + "," + alm.mon_num @@ -129,12 +132,14 @@ + "," + alm.alm_is_confirmed + ",'" + Com.getDateTimeFormat(alm.alm_confirmed_Time, Com.DTF_YMDhms) + "'" + "," + alm.alm_cleared_type + "," + alm.alm_severity + ")"; String sql_str_del = " DELETE FROM " + Sql_Mysql.Battalarm_Data_History + " WHERE MonNum = " + alm.mon_num + " " + " AND BattGroupId = " + alm.battgroup_id + " AND alm_cleared_type = " + alm.alm_cleared_type + " AND alm_start_time = '" + Com.getDateTimeFormat(alm.alm_start_time, Com.DTF_YMDhms) + "'" + " AND alm_id = " + alm.alm_id + " AND alm_signal_id = " + alm.alm_signal_id + ";"; @@ -162,7 +167,7 @@ createDevHistoryTable(pool, alm); //创建分表记录表 String sql_str_ins = " INSERT INTO " + Sql_Mysql.Tb_Devalarm_Data_History + Com.getDateTimeFormat(alm.record_time, Com.DTF_YM) + "(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) " + "(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,alm_severity) " + " values(" + alm.RecId + "," + alm.dev_id @@ -175,11 +180,13 @@ + "," + alm.alm_is_confirmed + ",'" + Com.getDateTimeFormat(alm.alm_confirmed_time, Com.DTF_YMDhms) + "'" + "," + alm.alm_cleared_type + "," + alm.alm_severity + ")"; String sql_str_del = " DELETE FROM " + Sql_Mysql.Devalarm_Data_History + " WHERE dev_id = " + alm.dev_id + " " + " AND alm_type = " + alm.alm_type + " AND alm_start_time = '" + Com.getDateTimeFormat(alm.record_time, Com.DTF_YMDhms) + "'" + " AND alm_cleared_type = " + alm.alm_cleared_type + ";"; Sql_Mysql sql = new Sql_Mysql(pool.getConn()); BattMonitor_FBS9100S_Alarm/src/com/battalarm/FBS9100_DevData.java
@@ -36,6 +36,8 @@ public boolean sdAlarm = false; //SD卡故障 public float max_diff_value = 0; //单体电压和组端电压的最大差值 public int alm_severity; //'告警重要等级[0:重要；1:紧急]' public DeviceAlarmData alm_Comm_AlarmData; //设备通信故障 BattMonitor_FBS9100S_Alarm/src/com/version_inf/version_inf.txt
@@ -15,6 +15,9 @@ 119013 单体预估容量告警 随时生效 V2.218 edit at date 2023-09-07 1.修复将设备历史告警插入历史告警分表时没有同时插入是否紧急标识bug 2.修复历史告警分表时会删除同类型的告警记录 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.217; public final static float m_VersionNum = (float) 2.218; public final static String m_Version = "Welcome To Use FBS9100S Alarm Mornitor V" + m_VersionNum + " RC_20170505"; /**************************************************************************/ /**************************************************************************/ @@ -234,7 +234,7 @@ BattAlarm_Thread_New2 BattAlarm = new BattAlarm_Thread_New2(m_AppConfig, GB_MysqlConnPool, GB_DataArray,appParam); BattAlarm.start(); //根据电池组告警更新电池告警 //根据电池组告警更新电池告警-----电池告警和设备告警分表逻辑 { BattDevHistory_SubtableThread hisAlam = new BattDevHistory_SubtableThread(GB_MysqlConnPool);
