From 4d6520c20a22475b72dd969381ea71dee4c1c9cd Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期三, 26 六月 2024 19:45:11 +0800
Subject: [PATCH] 修复不存在模型文件时通信不上bug
---
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 9 +++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
index b16b8ee..93ab94b 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
index 093a887..28c1a06 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
+++ b/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++) {
--
Gitblit v1.9.1