From 42277f878b1a659da499f88afdbdb0bbef2d00d2 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期六, 19 十月 2024 14:26:52 +0800
Subject: [PATCH] 修改测试逻辑

---
 IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java         |    2 +-
 IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java |    2 +-
 IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt              |    2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java b/IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java
index e8c22c1..59856a9 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java
@@ -18,7 +18,7 @@
 public class main_PowerDev_IEC61850 {
 	
 	public final static boolean app_debug = false;
-	public final static double m_VersionNum = 1.102;
+	public final static double m_VersionNum = 1.103;
 	public final static String m_Version = "Welcome To Use Monitor_PowerDev_IEC61850 V" 
 											+ m_VersionNum + " RC_20210621";
 	
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 18a72aa..2d543a4 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
@@ -264,7 +264,7 @@
                     if (fc_model_str.contains("/aciGGIO1.AnIn1.mag.f")) {                    	
                     	pwrDev_rtData.m_acdcData.acIn1_volA = ((BdaFloat32) fc_mode).getFloat();
 //                    	pwrDev_rtData.m_acdcData.acIn1_volA = readFloatNodeData(acdcDeviceName + "/aciGGIO1.AnIn1.mag.f", Fc.MX,pwrDev_rtData.m_acdcData.acIn1_volA);
-                    	System.out.println("pwrDev_rtData.m_acdcData.acIn1_volA:"+pwrDev_rtData.m_acdcData.acIn1_volA);
+                    	//System.out.println("pwrDev_rtData.m_acdcData.acIn1_volA:"+pwrDev_rtData.m_acdcData.acIn1_volA);
                     }else if(fc_model_str.contains("/aciGGIO1.AnIn2.mag.f")) {
                     	pwrDev_rtData.m_acdcData.acIn1_volB = ((BdaFloat32) fc_mode).getFloat();
 //                    	pwrDev_rtData.m_acdcData.acIn1_volB = readFloatNodeData(acdcDeviceName + "/aciGGIO1.AnIn2.mag.f", Fc.MX, pwrDev_rtData.m_acdcData.acIn1_volB);
diff --git a/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt b/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
index 7c3c444..b10d558 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
@@ -4,6 +4,8 @@
 	短信告警      [串口RS232]	 -  波特率   9600
 	
 
+V1.102  2024-10-19
+	1.电源超时告警测试
 
 V1.102  2024-01-22
 	1.电源通信程序运行时不再删除配电柜实时状态表重新创建

--
Gitblit v1.9.1