DELL
2024-06-26 4d6520c20a22475b72dd969381ea71dee4c1c9cd
修复不存在模型文件时通信不上bug
2个文件已修改
9 ■■■■■ 已修改文件
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -154,16 +154,17 @@
            try {
                m_ClientSap = new ClientSap();
                m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 102, null, null);
                if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName()) || null == m_ServerModel) {
                System.out.println(m_ServerModel);
                if(null == m_ServerModel || !FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {
                    //与预加载的模型文件不一致时
                    System.out.println(99999);
                    m_ServerModel = m_Association.retrieveModel();
                }
                //System.err.println("Dev_BASE:"+m_ServerModel.getBaseDevName());;
                
               
            } catch (Exception e) {
                logger.debug("BTS_IEC61850_Client Unable to connect to device IP:" + FBSDeviceIp);
                logger.error("BTS_IEC61850_Client Unable to connect to device IP:" + FBSDeviceIp);
                continue;
            }
            if(this.FBSDeviceName.indexOf("BTSE")>0) {
@@ -1044,7 +1045,7 @@
                    }
                    DataSet ds_stat = tmp_ds_stat.copy();
                    boolean[] alm  = new boolean[] {false,false,false,false,false};
                    int size_cnt_stat = ds_stat.getMembers().size();
                    int size_cnt_stat = tmp_ds_stat.getMembers().size();
                    m_Association.getDataSetValues(ds_stat);
                    int mon_alm_idx = 0;                    
                    for (int n = 0; n < size_cnt_stat; n++) {