From 7a1e39c59364ef80d68ea36c3e5aa004185077ba Mon Sep 17 00:00:00 2001 From: DELL <DELL@WIN-3EOIPEE9ML1> Date: 星期五, 23 二月 2024 09:18:35 +0800 Subject: [PATCH] 优化IEDScout 逻辑 --- iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task_Thread_SQL.java | 38 ++++++++++++++++++++++++++++++++------ iec61850_forFoShanAES_Model/bin/config.xml | 2 +- iec61850_forFoShanAES_Model/config.xml | 2 +- iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java | 5 ++++- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/iec61850_forFoShanAES_Model/bin/config.xml b/iec61850_forFoShanAES_Model/bin/config.xml index 1e9b6a6..a73c480 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>127.0.0.1</mysql_server_ip> + <mysql_server_ip>192.168.10.82</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 1e9b6a6..a73c480 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>127.0.0.1</mysql_server_ip> + <mysql_server_ip>192.168.10.82</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 28eac6e..252de10 100644 --- a/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java +++ b/iec61850_forFoShanAES_Model/src/com/iedscout/BTS61850_IEDScout_Task.java @@ -186,7 +186,8 @@ //鎵嬪姩鍋滄杩炴帴 if(BTS61850_IEDScout_Task_Thread_SQL.queryIed_NodeState_TableStopConnect(pool)) { - + m_App_IsConnect = false; + logger.error("DevIp:"+param.target_ip + " Remote DisConnect ... "); } if(null == DataSetIt) { @@ -208,6 +209,8 @@ param.setConn_st(IEDScout_Param.CONN_STATE_FAIL); BTS61850_IEDScout_Task_Thread_SQL.updateConnect_Inf_Table(pool, param); + + logger.error("DevIp:"+param.target_ip + " DisConnect ... "); } } 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 8b17e45..6385c01 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 @@ -19,15 +19,15 @@ Sql_Mysql sql = new Sql_Mysql(pool); try { res = sql.sqlMysqlQuery(sql_str); - if(!res.next()) { - sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Connect_Inf_Table + "(target_ip,target_port,conn_st) VALUES('127.0.0.1',102,0);"); - }else{ + if(res.next()) { int count_num = res.getInt("count_num"); if(count_num > 1) { - sql.sqlMysqlExecute("DELETE FROM " + Sql_Mysql.Connect_Inf_Table + " WHERE num > 1"); + sql.sqlMysqlExecute("DELETE FROM " + Sql_Mysql.Connect_Inf_Table); 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 { + }else if(count_num == 1){ sql.sqlMysqlExecute(" UPDATE " + Sql_Mysql.Connect_Inf_Table + " set conn_st = 0;"); + }else { + sql.sqlMysqlExecute("INSERT INTO " + Sql_Mysql.Connect_Inf_Table + "(num,target_ip,target_port,conn_st) VALUES(1,'127.0.0.1',102,0);"); } } } catch (SQLException e) { @@ -205,7 +205,33 @@ } public static boolean queryIed_NodeState_TableStopConnect(MysqlConnPool pool) { + String sql_str = "SELECT * FROM " + Sql_Mysql.Connect_Inf_Table +" where conn_st = 0;"; + boolean flag = false; + ResultSet res = null; + Sql_Mysql sql = new Sql_Mysql(pool); + try { + res = sql.sqlMysqlQuery(sql_str); + if(res.next()) { + flag = true; + } + } catch (SQLException e) { + sql.logger.error("BTS61850_IEDScout_Task_Thread_SQL.insertIntoIed_NodeState_Table():" + e.toString(), e); + } finally { + if(null != res) { + try { + res.close(); + } catch (SQLException e) { + sql.logger.error("BTS61850_IEDScout_Task_Thread_SQL.insertIntoIed_NodeState_Table():" + e.toString(), e); + } + } + sql.close_con(); + } + return flag; + } + + public static void main(String[] args) { + MysqlConnPool pool = new MysqlConnPool("192.168.10.82", 3360, 5); + System.out.println(queryIed_NodeState_TableStopConnect(pool));; - return false; } } -- Gitblit v1.9.1