From 1d169203088111ffc11b14a7ea9cff4d50869820 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期二, 19 三月 2024 14:24:05 +0800
Subject: [PATCH] 修复读取设备版本号不进行格式解析，无法确认版本格式化
---
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 20 ++++----------------
2 files changed, 4 insertions(+), 16 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 e77e454..41d4756 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 30f5960..d53322b 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
@@ -810,34 +810,22 @@
m_Association.getDataValues(fcModelNode);
m_FBS_VCData.m_SysState.resetErrCommCount();
ModelNode fc_mode = fcModelNode;
- String a[]= null;
- a = new String[5];
- a = (fc_mode.toString()).split(":");
- res_val = a[2];
- //System.out.println(a[3]);
- String split[]= null;
- split = new String[5];
- split = (res_val.toString()).split(", ");
- String result[]= null;
- result = new String[2];
- result[0] = split[0];
- result[1] = a[3];
-
- resul = String.format("%s,%s", result);
+ if(fc_mode instanceof BdaVisibleString) {
+ resul = new String(((BdaVisibleString)fc_mode).getValue());
+ }
} catch (ServiceError e) {
System.out.println("Service error: " + e.getMessage());
m_FBS_VCData.m_SysState.addErrCommCount();
return null;
} catch (Exception e) {
m_FBS_VCData.m_SysState.addErrCommCount();
- System.err.println(reference + " Fatal error: " + e.getMessage());
+ System.out.println("Fatal error: " + e.getMessage());
return null;
}
//System.out.println("Successfully read data.");
//System.out.println(resul);
return resul; //鎺у埗鑺傜偣TRUE FALSE
}
-
/*********************************************************************************************/
public boolean BTS_IEC61850_SocketComm(int cmd) throws InterruptedException {
--
Gitblit v1.9.1