From fae873382b0752b23855f25f40a22735b9982fe5 Mon Sep 17 00:00:00 2001
From: DELL <DELL@WIN-3EOIPEE9ML1>
Date: 星期四, 22 二月 2024 14:10:14 +0800
Subject: [PATCH] 优化iedscout调试工具
---
iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task_Thread_SQL.java | 7 +++++++
iec61850_forFoShanAES_Model/bin/config.xml | 2 +-
iec61850_forFoShanAES_Model/config.xml | 2 +-
iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java | 16 +++++++++++-----
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/iec61850_forFoShanAES_Model/bin/config.xml b/iec61850_forFoShanAES_Model/bin/config.xml
index ea32b1b..1e9b6a6 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.79</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_forFoShanAES_Model/config.xml b/iec61850_forFoShanAES_Model/config.xml
index ea32b1b..1e9b6a6 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.79</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_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
index 515ecba..28eac6e 100644
--- a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
+++ b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java
@@ -69,13 +69,13 @@
while(m_App_IsConnect) {
try {
- logger.error("BTS_IEC61850_Client Start to connect to device IP:" + param.target_ip + " Port:" + param.target_port);
+ logger.info("BTS_IEC61850_Client Start to connect to device IP:" + param.target_ip + " Port:" + param.target_port);
m_App_IsConnect = true;
m_ClientSap = new ClientSap();
- m_ClientSap.setMaxMmsPduSize(65000);
- m_ClientSap.setResponseTimeout(50000);
- m_ClientSap.setMessageFragmentTimeout(50000);
+// m_ClientSap.setMaxMmsPduSize(65000);
+// m_ClientSap.setResponseTimeout(50000);
+// m_ClientSap.setMessageFragmentTimeout(50000);
m_Association = m_ClientSap.associate(InetAddress.getByName(param.target_ip), param.target_port, null, null);
} catch (Exception e) {
@@ -151,6 +151,7 @@
ScoutData data = m_ScoutData.getScoutData(modelNode.toString1());
if(null != data) {
if(data.getNode_name().length() < 1 && !data.isRead_note()) {
+ //璇诲彇涓枃娉ㄩ噴
String zh_name = readUnicodeStringNodeData(fcData.toString1()+".dU",Fc.DC);
//System.err.println(fcData.toString1()+"=="+fcData.getFc()+"-"+zh_name);
@@ -174,6 +175,7 @@
BTS61850_IEDScout_Task_Thread_SQL.updateConnect_Inf_Table(pool, param);
ds = null;
+
//BTS61850_IEDScout_Task_Thread_SQL.updateIed_NodeState_Table(pool, m_ScoutData);
Thread.sleep(100);
}
@@ -182,6 +184,10 @@
mySQL_Task.setM_initTask(true);
}
+ //鎵嬪姩鍋滄杩炴帴
+ if(BTS61850_IEDScout_Task_Thread_SQL.queryIed_NodeState_TableStopConnect(pool)) {
+
+ }
if(null == DataSetIt) {
param.addErrorNum();
@@ -263,7 +269,7 @@
public static void main(String[] args) {
- MysqlConnPool pool = new MysqlConnPool("192.168.10.79",3360,10);
+ MysqlConnPool pool = new MysqlConnPool("127.0.0.1",3360,10);
BTS61850_IEDScout_Task_Thread thread = new BTS61850_IEDScout_Task_Thread(pool);
thread.start();
diff --git a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task_Thread_SQL.java b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task_Thread_SQL.java
index 5edff75..8b17e45 100644
--- a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task_Thread_SQL.java
+++ b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task_Thread_SQL.java
@@ -26,6 +26,8 @@
if(count_num > 1) {
sql.sqlMysqlExecute("DELETE FROM " + Sql_Mysql.Connect_Inf_Table + " WHERE num > 1");
sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Connect_Inf_Table + "(num,target_ip,target_port,conn_st) VALUES(1,'127.0.0.1',102,0);");
+ }else {
+ sql.sqlMysqlExecute(" UPDATE " + Sql_Mysql.Connect_Inf_Table + " set conn_st = 0;");
}
}
} catch (SQLException e) {
@@ -201,4 +203,9 @@
sql.close_con();
}
}
+
+ public static boolean queryIed_NodeState_TableStopConnect(MysqlConnPool pool) {
+
+ return false;
+ }
}
--
Gitblit v1.9.1