From 7baf1ae25ac9ed38e39155d0f962194813738260 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期日, 22 六月 2025 21:22:02 +0800
Subject: [PATCH] V1.113 2025-06-15 lijun 1.兼容泰科电源信息采集。 2.修复读取电源信息时，通信故障告警延迟较高。
---
IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java | 2 +-
IEC61850_ForPowerSupply_ForNW/src/com/power/comm/Power_61850_SocketClient.java | 40 +++++++++++++++++++++++++++++++++++++++-
IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt | 9 +++++++--
3 files changed, 47 insertions(+), 4 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 2e3a4b2..79e13a1 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/main/main_PowerDev_IEC61850.java
@@ -19,7 +19,7 @@
public class main_PowerDev_IEC61850 {
public final static boolean app_debug = false;
- public final static double m_VersionNum = 1.112;
+ public final static double m_VersionNum = 1.113;
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 d9cd50b..77d98f5 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
@@ -1724,6 +1724,10 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsCpssYc)", acdcDeviceName);
///-------------------------------------------------------------------------------------//
ds = m_ServerModel.getDataSet(acdcDeviceName + "/LLN0.dsCpssYc");
+ if(null == ds && pwrDev_rtData.PowerDevProtocolName.contains("TEMPLATE")) {
+ //兼容泰科设备
+ ds = m_ServerModel.getDataSet(acdcDeviceName + "/LLN0.dsCPSS" + pwrDev_rtData.PowerDevProtocolIndex + "Ain1");
+ }
}
if(null == ds) {
setErrCommCountInc(0);
@@ -1968,6 +1972,11 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsCpssYx)", acdcDeviceName);
//-------------------------------------------------------------------------------------//
ds = m_ServerModel.getDataSet(acdcDeviceName + "/LLN0.dsCpssYx");
+
+ if(null == ds && pwrDev_rtData.PowerDevProtocolName.contains("TEMPLATE")) {
+ //兼容泰科设备
+ ds = m_ServerModel.getDataSet(acdcDeviceName + "/LLN0.dsCPSS" + pwrDev_rtData.PowerDevProtocolIndex + "Din1");
+ }
}
if(null == ds) {
setErrCommCountInc(0);
@@ -2599,7 +2608,20 @@
PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID, 0, timeout_tag,dt);
}
- } if(fc_model_str.contains("/gdsGGIO1.IntIn.stVal")) {
+ }else if(fc_model_str.contains("/calmGGIO1.Alm99.stVal")) {
+ //协转与高频开关柜通信故障
+ origin_val = pwrDev_rtData.m_acdcData.is_comm_err;
+ pwrDev_rtData.m_acdcData.is_comm_err = ((BdaBoolean)fc_mode).getValue();
+ //System.out.println("is_comm_err:"+pwrDev_rtData.m_acdcData.is_comm_err);
+ if(origin_val==false && pwrDev_rtData.m_acdcData.is_battgroup1_fuse==true) {
+ Date dt = ((BdaTimestamp)fc_mode_t).getDate();
+ //Date dt = readNodeTimeStamp(acdcDeviceName + "/gswGGIO4.Alm.t", Fc.ST);
+ timeout_tag = checkIfBoolNodeTimeOut(dt);
+
+ PowerData_RT_SQL.make_TimeOutTag(m_ConnPool, pwrDev_rtData.PowerDevDeviceId, PwrDeviceAlarm_Data.ALM_TYPE_PWRDEV_CommErr_ID, 0, timeout_tag,dt);
+ }
+ }
+ if(fc_model_str.contains("/gdsGGIO1.IntIn.stVal")) {
if(fc_mode instanceof BdaBoolean) {
pwrDev_rtData.m_acdcData.acInUseCount = ((BdaBoolean)fc_mode).getValue()?1:0;
}else if(fc_mode instanceof BdaInt32) {
@@ -2868,6 +2890,10 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsAcswibYc)", acDeviceName);
//-------------------------------------------------------------------------------------//
ds = m_ServerModel.getDataSet(acDeviceName + "/LLN0.dsAcswibYc");
+ if(null == ds && pwrDev_rtData.PowerDevProtocolName.contains("TEMPLATE")) {
+ //兼容泰科设备
+ ds = m_ServerModel.getDataSet(acDeviceName + "/LLN0.dsACSWIB" + pwrDev_rtData.PowerDevProtocolIndex + "Ain1");
+ }
}
if(null == ds) {
setErrCommCountInc(0);
@@ -2962,6 +2988,10 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsAcswibYx)", acDeviceName);
//-------------------------------------------------------------------------------------//
ds = m_ServerModel.getDataSet(acDeviceName + "/LLN0.dsAcswibYx");
+ if(null == ds && pwrDev_rtData.PowerDevProtocolName.contains("TEMPLATE")) {
+ //兼容泰科设备
+ ds = m_ServerModel.getDataSet(acDeviceName + "/LLN0.dsACSWIB" + pwrDev_rtData.PowerDevProtocolIndex + "Din1");
+ }
}
if(null == ds) {
setErrCommCountInc(0);
@@ -3521,6 +3551,10 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsDcswibYc)", dcDeviceName);
//-------------------------------------------------------------------------------------//
ds = m_ServerModel.getDataSet(dcDeviceName + "/LLN0.dsDcswibYc");
+ if(null == ds && pwrDev_rtData.PowerDevProtocolName.contains("TEMPLATE")) {
+ //兼容泰科设备
+ ds = m_ServerModel.getDataSet(dcDeviceName + "/LLN0.dsDCSWIB" + pwrDev_rtData.PowerDevProtocolIndex + "Ain1");
+ }
}
if(null == ds) {
setErrCommCountInc(0);
@@ -3597,6 +3631,10 @@
logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsDcswibYx)", dcDeviceName);
//-------------------------------------------------------------------------------------//
ds = m_ServerModel.getDataSet(dcDeviceName + "/LLN0.dsDcswibYx");
+ if(null == ds && pwrDev_rtData.PowerDevProtocolName.contains("TEMPLATE")) {
+ //兼容泰科设备
+ ds = m_ServerModel.getDataSet(dcDeviceName + "/LLN0.dsDCSWIB" + pwrDev_rtData.PowerDevProtocolIndex + "Din1");
+ }
}
if(null == ds) {
setErrCommCountInc(0);
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 a974d12..11fe6d8 100644
--- a/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
+++ b/IEC61850_ForPowerSupply_ForNW/src/com/version_inf/version_inf.txt
@@ -5,8 +5,10 @@
第二套协议名称：ZJDY2
共济协转
第一套协议名称：TEMPLATE
-
-
+
+ 泰科协转
+ 第一套协议名称：TEMPLATE
+ 第二套协议名称：TEMPLATE2
DCDC电源
紫晶协转
第一套协议名称：ZJDYDDPS
@@ -30,6 +32,9 @@
高频开关柜
+V1.113 2025-06-15 lijun
+ 1.兼容泰科电源信息采集。
+ 2.修复读取电源信息时，通信故障告警延迟较高。
V1.112 2025-06-15 lijun
1.修复紫晶第二套DCDC电源读取的是第一套点位bug
--
Gitblit v1.9.1