From 002a26056f52f955973054b86f0cf537e0191531 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 15:51:50 +0800
Subject: [PATCH] 修复泰科设备兼容性问题
---
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 20 ++++++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
index 33752ad..38d9349 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class
Binary files differ
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 60d1d89..8bd28dd 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
@@ -159,6 +159,7 @@
}
try {
m_ClientSap = new ClientSap();
+// m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 44444, null, null);
m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 102, null, null);
// if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {
@@ -1391,8 +1392,8 @@
ds_tmp = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc");
- if(null == ds_tmp && FBSDeviceName.contains("TEMPLATEBTSE")) {
- ds_tmp = m_ServerModel.getDataSet("TEMPLATEBTSE/LLN0.dsDevAlarmTwo");
+ if(null == ds_tmp && FBSDeviceName.contains("TEMPLATEBTSE")) {
+ ds_tmp = m_ServerModel.getDataSet(ZJDYCPSS + "/LLN0.dsCPSSAin1");
if(null != ds_tmp) {
isTaiKe = true;
@@ -1506,15 +1507,22 @@
FBSDeviceIp, m_FBS_DiscParamFromDev);
//-------------------------------------------------------------------------------------//
} else if (FBS9100_ComBase.CMD_Stop == cmd) {
- if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO1")) return false;
- comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO1.Oper", false);
+
int count = 1;
if (m_FBS_VCData.m_SysState.WorkState == 2 || m_FBS_VCData.m_SysState.WorkState == 3) {
- count = 6;
+ count = 6; //鍋滄鏍稿娴嬭瘯
+ if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO1")) return false;
+ comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO1.Oper", false);
} else if (m_FBS_VCData.m_SysState.WorkState == 1) {
count = 7;
} else if (m_FBS_VCData.m_SysState.WorkState == 5) {
- count = 8;
+ count = 8; //鍋滄KD娴嬭瘯
+ if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO3")) return false;
+ comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO3.Oper", false);
+ } else if (m_FBS_VCData.m_SysState.WorkState == 4) {
+ count = 8; //鍋滄鍐呴樆娴嬭瘯
+ if(!setBTSPublicKeyY(getUKEYRootDomStr(FBSDeviceName)+"/ncdGGIO1.SPCSO2")) return false;
+ comm_res = BTS_IEC61850_Write_CO_Node(FBSDeviceName + "/ncdGGIO1.SPCSO2.Oper", false);
}
//comm_res = checkMakeSuccess(count);
//---------------------------------Log Level.WARN-------------------------------------//
--
Gitblit v1.9.1