From fb0837ed8e94572150af4c288aceba65327aa127 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期五, 15 三月 2024 14:00:57 +0800
Subject: [PATCH] 4.兼容通过南瑞协转读取的核容时长和组端下限异常bug
---
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt | 1 +
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 17 ++++++++++++-----
iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt | 1 +
4 files changed, 14 insertions(+), 5 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 01ffd8e..c41e82b 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/com/version_inf/version_inf.txt b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
index ab1abfa..c01a0c8 100644
--- a/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -9,6 +9,7 @@
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
3.鏂板閫氳繃61850璇诲彇鐐逛綅鏁版嵁锛屼慨澶峣cd鏂囦欢涓嶅尮閰嶄篃鑳介�氳繃缃戠粶灏濊瘯璇诲彇
+ 4.鍏煎閫氳繃鍗楃憺鍗忚浆璇诲彇鐨勬牳瀹规椂闀垮拰缁勭涓嬮檺寮傚父bug
V6.102 edit by lijun @ 2023-08-16
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 b9464cb..443d35b 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
@@ -1255,11 +1255,18 @@
//System.out.println(fc_model_str);
}
}
- //娴嬭瘯鏃堕暱
- m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
- //缁勭涓嬮檺
- m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
-
+ if(0 == m_FBS_DiscParamFromDev.GroupVol_LOW) {
+ //娴嬭瘯鏃堕暱
+ m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
+ //缁勭涓嬮檺
+ m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
+ }
+ if(0 == m_FBS_DiscParamFromDev.GroupVol_LOW) {
+ //娴嬭瘯鏃堕暱
+ m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(FBSDeviceName + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);
+ //缁勭涓嬮檺
+ m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(FBSDeviceName + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);
+ }
ds_pm = null;
}else {
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 ab1abfa..c01a0c8 100644
--- a/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
+++ b/iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -9,6 +9,7 @@
1.褰撳墠鐗堟湰淇敼涓哄崡鐟炲崗杞殑閫氫俊绋嬪簭
2.鍏煎姝ｅ父1鎵�2鍜屽父瑙�1鎵�2
3.鏂板閫氳繃61850璇诲彇鐐逛綅鏁版嵁锛屼慨澶峣cd鏂囦欢涓嶅尮閰嶄篃鑳介�氳繃缃戠粶灏濊瘯璇诲彇
+ 4.鍏煎閫氳繃鍗楃憺鍗忚浆璇诲彇鐨勬牳瀹规椂闀垮拰缁勭涓嬮檺寮傚父bug
V6.102 edit by lijun @ 2023-08-16
--
Gitblit v1.9.1