V6.106 edit by lijun	@  2024-04-19
1.修复老版本程序只能识别第一个干接点告警,2-10编号干接点告警无法触发
2.新增单体电压,单体内阻,单体温度,单体剩余容量告警,核容终止时剩余容量,核容终止时组端电压,核容终止时间等读取
13个文件已修改
89 ■■■■ 已修改文件
iec61850_forFoShanAES_Model/.settings/org.eclipse.core.resources.prefs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/.settings/org.eclipse.core.resources.prefs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_EventRecord.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_EventRecord.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/.settings/org.eclipse.core.resources.prefs
@@ -6,6 +6,7 @@
encoding//src/com/battdata_rt/BattStatData.java=UTF-8
encoding//src/com/battdata_rt/MonVolData.java=UTF-8
encoding//src/com/dec/fbs9100/AppParam.java=UTF-8
encoding//src/com/dec/fbs9100/BTS61850_EventRecord.java=GBK
encoding//src/com/dec/fbs9100/BTS61850_Task_Thread.java=UTF-8
encoding//src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java=UTF-8
encoding//src/com/dec/fbs9100/BTS_61850_SocketClient.java=UTF-8
iec61850_forFoShanAES_Model/bin/.settings/org.eclipse.core.resources.prefs
@@ -6,6 +6,7 @@
encoding//src/com/battdata_rt/BattStatData.java=UTF-8
encoding//src/com/battdata_rt/MonVolData.java=UTF-8
encoding//src/com/dec/fbs9100/AppParam.java=UTF-8
encoding//src/com/dec/fbs9100/BTS61850_EventRecord.java=GBK
encoding//src/com/dec/fbs9100/BTS61850_Task_Thread.java=UTF-8
encoding//src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java=UTF-8
encoding//src/com/dec/fbs9100/BTS_61850_SocketClient.java=UTF-8
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_EventRecord.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class
Binary files differ
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -3,6 +3,10 @@
     
    注意当前版本在设置紫晶组2的61850协转签名时用的     BTSE/
V6.106 edit by lijun    @  2024-04-19
    1.修复老版本程序只能识别第一个干接点告警,2-10编号干接点告警无法触发
    2.新增单体电压,单体内阻,单体温度,单体剩余容量告警,核容终止时剩余容量,核容终止时组端电压,核容终止时间等读取
V6.105 edit by lijun    @  2024-02-21    
    1.新增sign_type 标识当前设备是标准1托1还是标准1托2设备
        [注意:在连接的设备是标准1托2时,电池信息配置中请选择标准1托2]
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
@@ -53,7 +53,7 @@
    </Appenders>
    <Loggers>
        <Root level="trace">
        <Root level="info">
            <AppenderRef ref="Console" />
            <appenderRef ref="INFO" />
            <appenderRef ref="ERROR" />
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
@@ -53,7 +53,7 @@
    </Appenders>
    <Loggers>
        <Root level="trace">
        <Root level="info">
            <AppenderRef ref="Console" />
            <appenderRef ref="INFO" />
            <appenderRef ref="ERROR" />
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_EventRecord.java
@@ -6,6 +6,7 @@
    public static final int Event_CONNCET_Error_type = 2;                            //通讯告警
    public static final int Event_HIGTMP_Error_type = 3;                            //设备过温告警
    public static final int Event_DIODE_Error_type = 4;                                //二极管D1告警
    public static final int Event_DRYSTEAM_Error_type = 5;                            //干接点告警
    
    public static final int Event_WorkState_Type = 10;                                //设备状态切换事件
    
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -1044,25 +1044,65 @@
                        return false;
                    }
                    DataSet ds_stat = tmp_ds_stat.copy();
                    boolean[] alm  = new boolean[] {false,false,false,false,false};
                    int size_cnt_stat = ds_stat.getMembers().size();
                    c = new String[size_cnt_stat];
                    String[] split = null;
                    split = new String[2];
                    m_Association.getDataSetValues(ds_stat);
                    String sb = null;
                    String temp = "%s";
                    //限制当前告警个数
                    size_cnt_stat = 5;
                    int mon_alm_idx = 0;
                    for (int n = 0; n < size_cnt_stat; n++) {
                        //System.err.println(ds_stat.getMembers().get(n).getName());
                        if(null == ds_stat.getMembers().get(n).getChild("stVal")) {
                            //System.err.println(ds.getMembers().get(n).getChild("mag").toString1());
                            continue;
                        }
                        FcModelNode fc_mode = (FcModelNode) ds_stat.getMembers().get(n).getChild("stVal");
                        split = fc_mode.toString().split(": ");
                        c[n] = split[1];
                        if(n>0) {
                            temp += ",%s";
                        if(fc_mode instanceof BdaBoolean) {
                            //JTextField tf_t = (JTextField) data.getValueField();
                            //System.out.println("n:"+n+" "+fc_mode.toString1());
                            String fc_mode_str = fc_mode.toString1();
                            if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO1.Alm1")){
                                //通信蓄电池远程核容装置常闭接触器K1告警
                                alm[0] = ((BdaBoolean)fc_mode).getValue();
                            }else if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO1.Alm2")){
                                //通信蓄电池远程核容装置通讯告警
                                alm[1] = ((BdaBoolean)fc_mode).getValue();
                            }else if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO1.Alm3")){
                                //通信蓄电池远程核容装置过温告警
                                alm[2] = ((BdaBoolean)fc_mode).getValue();
                            }else if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO1.Alm4")){
                                //通信蓄电池远程核容装置二极管D1告警
                                alm[3] = ((BdaBoolean)fc_mode).getValue();
                            }else if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO") && fc_mode_str.contains(".Alm5")){
                                //干接点输入故障-10个干接点点位有一个告警即触发干接点告警
                                alm[4] = (alm[4] || ((BdaBoolean)fc_mode).getValue());
                            }else if(fc_mode_str.contains(FBSDeviceName + "/btgGGIO1.Alm1")) {
                                //电池组端电压告警
                                m_FBS_VCData.groupvolalm[0] = ((BdaBoolean)fc_mode).getValue();
                            }else if(fc_mode_str.contains(FBSDeviceName + "/celGGIO1.Alm")) {
                                //电池组单体告警
                                if(0 <= mon_alm_idx && mon_alm_idx < 24) {
                                    //单体电压告警
                                    m_FBS_VCData.monvol_alm[mon_alm_idx] = ((BdaBoolean)fc_mode).getValue();
                                }else if(24 <= mon_alm_idx && mon_alm_idx < 48) {
                                    //单体内阻告警
                                    m_FBS_VCData.monres_alm[mon_alm_idx-24] = ((BdaBoolean)fc_mode).getValue();
                                }else if(48 <= mon_alm_idx && mon_alm_idx < 72) {
                                    //单体温度告警
                                    m_FBS_VCData.montmp_alm[mon_alm_idx-48] = ((BdaBoolean)fc_mode).getValue();
                                }else if(72 <= mon_alm_idx && mon_alm_idx < 96) {
                                    //单体剩余容量告警
                                    m_FBS_VCData.moncap_alm[mon_alm_idx-72] = ((BdaBoolean)fc_mode).getValue();
                                }
                                mon_alm_idx ++;
                        }
                    }
                    sb = String.format(temp, (Object[])c);
                    }
                    getFBS9100MonAlmData(m_FBS_VCData);
                    String sb = String.format("%b,%b,%b,%b,%b",alm[0],alm[1],alm[2],alm[3],alm[4]);
                    m_FBS_VCData.m_SysState.last_dev_61850alam = m_FBS_VCData.m_SysState.dev_61850alam; // 记录上一次告警状态
                    m_FBS_VCData.m_SysState.dev_61850alam = sb;
    
@@ -1087,7 +1127,7 @@
                    //System.out.println(FBSDeviceName + "/LLN0.dsDevState 节点数:"+size_cnt);
                    m_Association.getDataSetValues(ds);
                    // 屏蔽当前根节点下新添加的ukey内容
                    for (int n = 0; n < size_cnt && n < 120; n++) {
                    for (int n = 0; n < size_cnt ; n++) {
                        if(null == ds.getMembers().get(n).getChild("mag") || null == ds.getMembers().get(n).getChild("mag").getChild("f")) {
                            //System.err.println(ds.getMembers().get(n).getChild("mag").toString1());
                            continue;
@@ -1163,6 +1203,16 @@
                        }else if (fc_mode_str.contains(FBSDeviceName+"/ncdGGIO1.AnIn110.mag.f")) {
                            fod_state.RestTime_four = ((BdaFloat32) fc_mode).getFloat();
                            //fod_state.RestTime_four = (int)readFloatNodeData(FBSDeviceName+"/ncdGGIO1.AnIn110.mag.f", Fc.MX);
                        }else if(fc_mode_str.contains(ZJDYCPSS + "/cheGGIO1.LoBatAh.mag.f")) {
                            //核容终止时剩余容量
                            m_FBS_VCData.test_end_cap[0] = ((BdaFloat32) fc_mode).getFloat();
                        }else if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO1.AnIn4.mag.f")) {
                            //核容终止时组端电压
                            m_FBS_VCData.test_end_vol[0] = ((BdaFloat32) fc_mode).getFloat();
                        }else if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO1.AnIn3.mag.f")) {
                            //核容终止时间
                            m_FBS_VCData.test_timelong[0] = ((BdaFloat32) fc_mode).getFloat()*60*60;
                            //System.out.println("test_timelong:" + ((BdaFloat32) fc_mode).getFloat());
                        }
                    
                    }
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
@@ -29,7 +29,7 @@
    /**************************************************************************/
    /**************************************************************************/
    public final static boolean app_debug = false;
    public final static double m_VersionNum = 6.105;
    public final static double m_VersionNum = 6.106;
    public final static String m_Version = "Welcome To Use BattMonitor_BTS_IEC61850 V" 
                                            + m_VersionNum + " RC_20201003";
    /**************************************************************************/
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -3,6 +3,10 @@
     
    注意当前版本在设置紫晶组2的61850协转签名时用的     BTSE/
V6.106 edit by lijun    @  2024-04-19
    1.修复老版本程序只能识别第一个干接点告警,2-10编号干接点告警无法触发
    2.新增单体电压,单体内阻,单体温度,单体剩余容量告警,核容终止时剩余容量,核容终止时组端电压,核容终止时间等读取
V6.105 edit by lijun    @  2024-02-21    
    1.新增sign_type 标识当前设备是标准1托1还是标准1托2设备
        [注意:在连接的设备是标准1托2时,电池信息配置中请选择标准1托2]