From c4e51877fd5231fb4fd06030c6b703d5c9ff9fa0 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期四, 14 三月 2024 11:08:52 +0800
Subject: [PATCH] 优化IEDScout调试工具，没有中文注释仍然进行数据读取
---
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java | 2 +-
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt | 1 +
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt | 1 +
iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java | 10 ++++++++--
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
index a123d45..ab1abfa 100644
--- a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -8,6 +8,7 @@
V2.102 edit by lijun @ 2023-08-16
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
+ 3.鏂板閫氳繃61850璇诲彇鐐逛綅鏁版嵁锛屼慨澶峣cd鏂囦欢涓嶅尮閰嶄篃鑳介�氳繃缃戠粶灏濊瘯璇诲彇
V6.102 edit by lijun @ 2023-08-16
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
index 2a50833..b416b54 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
@@ -24,7 +24,7 @@
public final static boolean is_app_for_fbs_free_only = false;
public final static boolean is_app_for_bpm7100_only = false;
public final static boolean is_app_for_FBS9100S_only = true;
- /**************************************************0.
+ /**************************************************
* ************************/
/**************************************************************************/
/**************************************************************************/
diff --git a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
index 37d82fc..3a791a4 100644
--- a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
+++ b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
@@ -102,12 +102,18 @@
m_ServerModel = serverSaps.get(0).serverModel;
}catch (Exception e1) {
+ logger.info("Error Parsing ICD File: " + e1.getMessage());
+
+ }
+ if(null==m_ServerModel) {
+ m_ServerModel = m_Association.retrieveModel();
+ }
+ if(null==m_ServerModel) {
param.setFail_reasion(IEDScout_Param.FAILREASION_FILEERROR);
param.setConn_st(IEDScout_Param.CONN_STATE_FAIL);
-
- logger.info("Error Parsing ICD File: " + e1.getMessage());
break;
}
+
logger.info("Successfully Read Model ");
List<BasicDataAttribute> ms = m_ServerModel.getBasicDataAttributes();
diff --git a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
index a123d45..ab1abfa 100644
--- a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -8,6 +8,7 @@
V2.102 edit by lijun @ 2023-08-16
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
+ 3.鏂板閫氳繃61850璇诲彇鐐逛綅鏁版嵁锛屼慨澶峣cd鏂囦欢涓嶅尮閰嶄篃鑳介�氳繃缃戠粶灏濊瘯璇诲彇
V6.102 edit by lijun @ 2023-08-16
--
Gitblit v1.9.1