From 6558385f43f36a00a3c07d78f0b49934606d91a1 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期六, 25 六月 2022 08:42:05 +0800
Subject: [PATCH] 修改

---
 IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java |    2 ++
 IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java  |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java b/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java
index 41a521f..f0c50e2 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java
@@ -243,6 +243,8 @@
 		pwrDev_rtData.m_acdcData.loader_curr = readFloatNodeData(acdcDeviceName + "/dbmGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.loader_curr);
 		
 		pwrDev_rtData.m_acdcData.battgroup1_curr = readFloatNodeData(acdcDeviceName + "/btgGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.battgroup1_curr);		
+		//battgroup2Curr
+		pwrDev_rtData.m_acdcData.battgroup2_curr = readFloatNodeData(acdcDeviceName + "/btgGGIO2.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.battgroup2_curr);		
 		
 		pwrDev_rtData.m_acdcData.chargLimitCurr = readFloatNodeData(acdcDeviceName + "/cheGGIO1.AnIn4.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.chargLimitCurr);		
 		pwrDev_rtData.m_acdcData.junChargeVol = readFloatNodeData(acdcDeviceName + "/cheGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.junChargeVol);		
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java b/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java
index dd9fb4f..79c29da 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_Task_Thread.java
@@ -49,7 +49,8 @@
 		AL_POWER_RT_DATA_INDEX.clear();
 		
 		for(int n=0;n<m_AL_Data.getItemCount();n++) {
-			if(110 != (m_AL_Data.getItem(n).PowerDevDeviceId/1000000)) {
+			if(115 != (m_AL_Data.getItem(n).PowerDevDeviceId/1000000)) {
+				System.out.println(m_AL_Data.getItem(n).PowerDevDeviceId);
 				continue;
 			}
 			

--
Gitblit v1.9.1