From d4ce08da13fe325fcd304e7618ba6169fcd05a9c Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期四, 11 四月 2024 11:09:39 +0800
Subject: [PATCH] 兼容在icd文件丢失的情况下仍能继续连接设备，读取加载设备端icd文件信息
---
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread.class | 0
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class | 0
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java | 2 +-
iec61850_forFoShanAES_Model/bin/config.xml | 2 +-
iec61850_forFoShanAES_Model/config.xml | 2 +-
iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java | 2 +-
6 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread.class b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread.class
index 4b03dbe..16d7219 100644
--- a/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread.class
+++ b/iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread.class
Binary files differ
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 41d4756..504f826 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/bin/config.xml b/iec61850_forFoShanAES_Model/bin/config.xml
index a73c480..ea32b1b 100644
--- a/iec61850_forFoShanAES_Model/bin/config.xml
+++ b/iec61850_forFoShanAES_Model/bin/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>192.168.10.79</mysql_server_ip>
<!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
<!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
<!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->
diff --git a/iec61850_forFoShanAES_Model/config.xml b/iec61850_forFoShanAES_Model/config.xml
index a73c480..ea32b1b 100644
--- a/iec61850_forFoShanAES_Model/config.xml
+++ b/iec61850_forFoShanAES_Model/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>192.168.10.79</mysql_server_ip>
<!--SOURCE_BATTDATA_TYPE_FBSDEV = 0-->
<!--SOURCE_BATTDATA_TYPE_SQLSERVER = 1-->
<!--SOURCE_BATTDATA_TYPE_C_INTERFACE = 2-->
diff --git a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java
index 493e763..91c5649 100644
--- a/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java
+++ b/iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread.java
@@ -60,7 +60,7 @@
if(null == m_ServerModel) {
logger.error("error, the iec61850 server model is null....");
- return;
+ //return;
}
AL_BTS_IEC61850_DeviceIp.clear();
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 d53322b..842876f 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
@@ -155,7 +155,7 @@
m_ClientSap = new ClientSap();
m_Association = m_ClientSap.associate(InetAddress.getByName(FBSDeviceIp), 102, null, null);
- if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName())) {
+ if(!FBSDeviceName.contains(m_ServerModel.getBaseDevName()) || null == m_ServerModel) {
//涓庨鍔犺浇鐨勬ā鍨嬫枃浠朵笉涓�鑷存椂
m_ServerModel = m_Association.retrieveModel();
}
--
Gitblit v1.9.1