From 8295ec1295eb6b0db77d5079ab6f324513ade80d Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期四, 07 三月 2024 13:10:21 +0800
Subject: [PATCH] 南瑞版本新增iedscout调试工具功能
---
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
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 df4e5aa..cca511b 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
@@ -161,7 +161,7 @@
// if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {
// System.err.println("SSSSSSSSSSS");
// //涓庨鍔犺浇鐨勬ā鍨嬫枃浠朵笉涓�鑷存椂
-// m_ServerModel = m_Association.retrieveModel();
+ m_ServerModel = m_Association.retrieveModel();
// }
System.err.println("Dev_BASE:"+m_ServerModel.getBaseDevName());;
@@ -811,7 +811,6 @@
events.clear();
if(0 == (numberDevState%3)) {
- System.out.println();
//---------------------------------Log Level.TRACE-------------------------------------//
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsBtseYc)", FBSDeviceName);
//-------------------------------------------------------------------------------------//
@@ -1078,6 +1077,13 @@
//-------------------------------------------------------------------------------------//
comm_res = true;
DataSet ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsDevState");
+ if(null == ds) {
+ //鍏煎鑰佺増鏈崗杞暟鎹�
+ ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc");
+ }
+ if(null == ds) {
+ return false;
+ }
int size_cnt = ds.getMembers().size();
//System.out.println(FBSDeviceName + "/LLN0.dsDevState 鑺傜偣鏁�:"+size_cnt);
m_Association.getDataSetValues(ds);
@@ -1090,7 +1096,7 @@
FcModelNode fc_mode = (FcModelNode) ds.getMembers().get(n).getChild("mag").getChild("f");
BasicDataBind<?> data = new Float32DataBind((BdaFloat32) fc_mode);
//JTextField tf_t = (JTextField) data.getValueField();
- //System.out.println("n:"+n+" "+fc_mode.toString1());
+ //System.out.println("n:"+n+" "+fc_mode.toString1()+"==="+((BdaFloat32) fc_mode).getFloat().intValue());
String fc_mode_str = fc_mode.toString1();
if(fc_mode_str.contains(FBSDeviceName + "/ncdGGIO1.StaNum.mag.f")){
int st = ((BdaFloat32) fc_mode).getFloat().intValue();
@@ -1256,7 +1262,7 @@
m_FBS_DiscParamFromDev.ChargeCurrSet = Float.parseFloat(tf_t.getText());
//m_FBS_DiscParamFromDev.ChargeCurrSet = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.ChargeCurr.mag.f", Fc.MX);
}else {
- System.out.println(fc_model_str);
+ //System.out.println(fc_model_str);
}
}
//娴嬭瘯鏃堕暱
--
Gitblit v1.9.1