DELL
2024-04-28 c17909db968e7a9b6391445b28c59f7398279ab5
告警修改
3个文件已删除
5个文件已添加
5个文件已修改
57 ■■■■■ 已修改文件
BattMonitor_FBS9100S_Alarm/bin/com/battdata_rt/BattData_RT.class 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/bin/com/battdata_rt/BattData_RT_Array.class 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/error-20230818-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/error-20230819-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230616-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230724-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230725-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230818-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230819-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20231227-1.log.gz 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info.log 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/src/com/battdata_rt/BattData_RT.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/src/com/battdata_rt/BattData_RT_Array.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BattMonitor_FBS9100S_Alarm/bin/com/battdata_rt/BattData_RT.class
Binary files differ
BattMonitor_FBS9100S_Alarm/bin/com/battdata_rt/BattData_RT_Array.class
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/error-20230818-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/error-20230819-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230616-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230724-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230725-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230818-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20230819-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info-20231227-1.log.gz
Binary files differ
BattMonitor_FBS9100S_Alarm/fbs9100s_alarm_x64_logs/info.log
@@ -283,3 +283,51 @@
2024-01-26 15:19:17.332 [Thread-14] [INFO] com.battalarm.BattDevHistory_SubtableThread -  BattDevHistory_SubtableThread Start at 2024-01-26 15:19:17
2024-01-26 15:19:17.340 [Thread-12] [INFO] com.battalarm.BattAlarm_Thread_New2 - Thread-12 - BattAlarm_Thread Delayed For 1 Seconds To Start...
2024-01-26 15:19:17.342 [Thread-12] [INFO] com.battalarm.BattAlarm_Thread_New2 - Thread-12 - BattAlarm_Thread Started at 2024-01-26 15:19:17
2024-01-26 15:20:16.782 [main] [INFO] main.main_FBS9100S_Alarm - /****************************************************************
2024-01-26 15:20:16.784 [main] [INFO] main.main_FBS9100S_Alarm - *****************************************************************
2024-01-26 15:20:16.785 [main] [INFO] main.main_FBS9100S_Alarm - ****************************************************************/
2024-01-26 15:20:16.785 [main] [INFO] main.main_FBS9100S_Alarm - Welcome To Use FBS9100S Alarm Mornitor V2.219 RC_20170505 app_for_fbs_free_only
2024-01-26 15:20:16.840 [main] [INFO] main.main_FBS9100S_Alarm - IP:127.0.0.1     port:3360
2024-01-26 15:20:17.382 [main] [INFO] main.main_FBS9100S_Alarm -  开始检测数据库连接 2024-01-26 15:20:17
2024-01-26 15:20:17.738 [main] [INFO] main.main_FBS9100S_Alarm - 检测数据库连接成功
2024-01-26 15:20:17.739 [main] [INFO] main.main_FBS9100S_Alarm - IP:127.0.0.1port3360
2024-01-26 15:20:17.817 [main] [WARN] com.battdata_rt.BattData_RT_Array - run initBattDataRT_Inf_FromSQL()
2024-01-26 15:20:17.828 [main] [INFO] main.main_FBS9100S_Alarm - ------------------- AppConfig start -----------------------------------
2024-01-26 15:20:17.828 [main] [INFO] main.main_FBS9100S_Alarm - MysqlServerIp=127.0.0.1
2024-01-26 15:20:17.829 [main] [INFO] main.main_FBS9100S_Alarm - SybaseServerIp=127.0.0.1
2024-01-26 15:20:17.829 [main] [INFO] main.main_FBS9100S_Alarm - MysqlConnCountMax=400
2024-01-26 15:20:17.829 [main] [INFO] main.main_FBS9100S_Alarm - WorkThreadCountMax=300
2024-01-26 15:20:17.829 [main] [INFO] main.main_FBS9100S_Alarm - SourceBattDataType=0
2024-01-26 15:20:17.829 [main] [INFO] main.main_FBS9100S_Alarm - FbsDeviceBaseIp=192.168.0.1
2024-01-26 15:20:17.829 [main] [INFO] main.main_FBS9100S_Alarm - BattAlarmFnEn=false
2024-01-26 15:20:17.829 [main] [INFO] main.main_FBS9100S_Alarm - BattAlarmFnStartDelay=1
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - BattAlarmClearedDelay=1
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - BattResStoreFnEn=false
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - BattResStoreDelayForTestManual=1200
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - BattResStoreDayInterval=7
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - ------------------- AppConfig end -----------------------------------
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - --------------------- App_Param start---------------------------------
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - Discharge_TestTimeLongMinimum=60
2024-01-26 15:20:17.830 [main] [INFO] main.main_FBS9100S_Alarm - Discharge_SaveDataTimeInterval=10
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - Discharge_MonVolChangeLevel=0.01
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - Discharge_BattTestGroupCountMax=100
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - Discharge_TestDataRecordCountMax=10000
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - --------------------------------------------------------------------
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - Charge_TestTimeLongMinimum=60
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - Charge_SaveDataTimeInterval=30
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - Charge_MonVolChangeLevel=0.01
2024-01-26 15:20:17.831 [main] [INFO] main.main_FBS9100S_Alarm - Charge_BattTestGroupCountMax=10
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - Charge_TestDataRecordCountMax=10000
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - --------------------------------------------------------------------
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - Poweroff_TestTimeLongMinimum=1800
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - Poweroff_SaveDataTimeInterval=10
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - Poweroff_MonVolChangeLevel=0.05
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - Poweroff_BattTestGroupCountMax=10
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - Poweroff_TestDataRecordCountMax=10000
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - --------------------------------------------------------------------
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - Discharge_BattJunHengFN=false
2024-01-26 15:20:17.832 [main] [INFO] main.main_FBS9100S_Alarm - --------------------- App_Param end---------------------------------
2024-01-26 15:20:17.869 [Thread-10] [INFO] com.battalarm.DeviceAlarm_Thread_New2 - Thread-10 - DevAlarm_Thread Started at 2024-01-26 15:20:17
2024-01-26 15:20:18.020 [Thread-14] [INFO] com.battalarm.BattDevHistory_SubtableThread -  BattDevHistory_SubtableThread Start at 2024-01-26 15:20:18
2024-01-26 15:20:18.027 [Thread-12] [INFO] com.battalarm.BattAlarm_Thread_New2 - Thread-12 - BattAlarm_Thread Delayed For 1 Seconds To Start...
2024-01-26 15:20:18.030 [Thread-12] [INFO] com.battalarm.BattAlarm_Thread_New2 - Thread-12 - BattAlarm_Thread Started at 2024-01-26 15:20:18
BattMonitor_FBS9100S_Alarm/src/com/battdata_rt/BattData_RT.java
@@ -43,6 +43,7 @@
    public int MonCount = 1;
    public float MonStdVol;
    public float MonStdCap;
    public float MonResStd;            //标称内阻
    
    public int dev_workstate;        //设备工作状态
    
@@ -375,7 +376,8 @@
        alm_param.setAlarmParamCellValue(std_monvol, m_AlarmParam.alm_DischargeMonVol, alm_param.alm_DischargeMonVol);
        float std_montmp = 25;
        alm_param.setAlarmParamCellValue(std_montmp, m_AlarmParam.alm_MonTmp, alm_param.alm_MonTmp);
        float std_monres = (1*(MonStdVol/2)) / (MonStdCap/100);
        //float std_monres = (1*(MonStdVol/2)) / (MonStdCap/100);
        float std_monres = MonResStd;
        alm_param.setAlarmParamCellValue(std_monres, m_AlarmParam.alm_MonRes, alm_param.alm_MonRes);
        float std_connres = (float) 0.2;
        alm_param.setAlarmParamCellValue(std_connres, m_AlarmParam.alm_ConnRes, alm_param.alm_ConnRes);
BattMonitor_FBS9100S_Alarm/src/com/battdata_rt/BattData_RT_Array.java
@@ -84,7 +84,7 @@
            
            sql_str = "    SELECT DISTINCT StationId,StationName,StationIp, "
                    + " FBSDeviceId,FBSDeviceIp,FBSDeviceName,GroupIndexInFBSDevice,"
                    + " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd"
                    + " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd,MonResStd"
                    + " FROM " + Sql_Mysql.BattInf_Table
                    + " ORDER BY BattGroupId ASC";
            
@@ -115,6 +115,7 @@
                
                rtdata.MonStdCap = res.getFloat("MonCapStd");
                rtdata.MonStdVol = res.getFloat("MonVolStd");
                rtdata.MonResStd = res.getFloat("MonResStd");
                rtdata.setBattFloatVolCurrLevel(res.getFloat("FloatVolLevel"), res.getFloat("BattFloatCurrent"));
                Data_Array.add(rtdata);
            }
@@ -225,7 +226,7 @@
            
            String sql_str = "SELECT DISTINCT "
                            + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,"
                            + " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd,CInterFaceId,PackCount"
                            + " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd,MonResStd,CInterFaceId,PackCount"
                            + " FROM " + Sql_Mysql.BattInf_Table
                            + " ORDER BY BattGroupId ASC";