From 6e0e9bffc22452be7faf8a16f760ced80b776549 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期三, 16 十月 2024 12:17:54 +0800
Subject: [PATCH] 修复电源通信程序中的中断不能重连bug
---
IEC61850_ForPowerSupply_ForNW/config.xml | 2 +-
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/IEC61850_ForPowerSupply_ForNW/config.xml b/IEC61850_ForPowerSupply_ForNW/config.xml
index a73c480..1e9b6a6 100644
--- a/IEC61850_ForPowerSupply_ForNW/config.xml
+++ b/IEC61850_ForPowerSupply_ForNW/config.xml
@@ -2,7 +2,7 @@
<root>
<mysql_ramdb_recreate_en>false</mysql_ramdb_recreate_en>
- <mysql_server_ip>192.168.10.82</mysql_server_ip>
+ <mysql_server_ip>127.0.0.1</mysql_server_ip>
<!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
<!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
<!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->
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 ba3ff30..a474d80 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
@@ -153,12 +153,13 @@
//*******************************************************************************
while (true == m_App_IsAlive) {
- PowerDev_IEC61850_SocketComm();
try {
sleep(500);
- } catch (InterruptedException e1) {
- // TODO Auto-generated catch block
+
+ PowerDev_IEC61850_SocketComm();
+ } catch (Exception e1) {
+ setErrCommCountInc(0);
logger.error(e1.toString(), e1);
}
@@ -212,13 +213,13 @@
}
else if(devIndex%3 == 1) {
//System.out.println("读取交流交流配电柜"+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));
- //read_AC_LD();
+ read_AC_LD();
pwrDev_rtData.UpdatePower_AC_Data_ToTable();
}
else {
//System.out.println("读取直流配电柜"+Com.getDateTimeFormat(new Date(), Com.DTF_YMDhms));
- //read_DC_LD();
+ read_DC_LD();
pwrDev_rtData.UpdatePower_DC_Data_ToTable();
}
@@ -256,6 +257,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);
}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);
--
Gitblit v1.9.1