From e2b11d5aee5f0d2a019045ae89d0f88040944539 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期四, 07 三月 2024 14:06:27 +0800
Subject: [PATCH] 修复设备版本号
---
iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml | 2 +-
iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml | 2 +-
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 18 ++++--------------
4 files changed, 6 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 fe37df1..01ffd8e 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/bin/log4j2_batt_61850_dev_x64.xml b/iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
index 358800b..8aabf0e 100644
--- a/iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
+++ b/iec61850_forFoShanAES_Model/bin/log4j2_batt_61850_dev_x64.xml
@@ -63,7 +63,7 @@
</Appenders>
<Loggers>
- <Root level="info">
+ <Root level="trace">
<AppenderRef ref="Console" />
<appenderRef ref="INFO" />
<appenderRef ref="ERROR" />
diff --git a/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml b/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
index 358800b..8aabf0e 100644
--- a/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
+++ b/iec61850_forFoShanAES_Model/log4j2_batt_61850_dev_x64.xml
@@ -63,7 +63,7 @@
</Appenders>
<Loggers>
- <Root level="info">
+ <Root level="trace">
<AppenderRef ref="Console" />
<appenderRef ref="INFO" />
<appenderRef ref="ERROR" />
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 cca511b..b9464cb 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
@@ -15,6 +15,7 @@
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.openmuc.openiec61850.BdaBitString;
import org.openmuc.openiec61850.BdaBoolean;
import org.openmuc.openiec61850.BdaFloat32;
import org.openmuc.openiec61850.BdaInt64;
@@ -774,20 +775,9 @@
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();
--
Gitblit v1.9.1