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/src/com/dec/fbs9100/BTS_61850_SocketClient.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 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 {
 					

--
Gitblit v1.9.1