From 82a1df37075dba7ca7f26984c7a16b659249cd52 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期二, 02 四月 2024 13:17:19 +0800
Subject: [PATCH] 兼容无icd文件解析
---
iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
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 435846e..3f1f62c 100644
--- a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
+++ b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
@@ -96,16 +96,21 @@
break;
}
- try {
+ try {
//鍔犺浇妯″瀷鏂囦欢
List<ServerSap> serverSaps = ServerSap.getSapsFromSclFile(param.target_icd);
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 ");
--
Gitblit v1.9.1