iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread.classBinary files differ
iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.classBinary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.classBinary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/FBS9100_Task_Thread_SQL.classBinary files differ
iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.classBinary files differ
iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt
@@ -3,6 +3,9 @@ 注意当前版本在设置紫晶组2的61850协转签名时用的 BTSE/ V6.108 edit by lijun @ 2024-09-06 1.修复通信线程，MSQL抛出异常导致线程异常结束bug V6.107 edit by lijun @ 2024-08-12 1.新增放电历史数据清洗逻辑，针对于放电测试数据末尾测试电流 < 平均电流*0.8的历史数据移动到数据清洗表中
@@ -29,26 +29,25 @@ logger.info("Server Run State RT_RamDB_Thread Started... "); while(true) { if(false == server_start_inf_set_ok) { server_start_inf_set_ok = BattData_RT_RamDB_Thread_SQL .updateServerStartInfTo_RamDB_Table(m_conn_pool, ser_ver); } if(al_bgdata.size() < 1) { try { Thread.sleep(1000); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); } continue; } try { if(false == server_start_inf_set_ok) { server_start_inf_set_ok = BattData_RT_RamDB_Thread_SQL .updateServerStartInfTo_RamDB_Table(m_conn_pool, ser_ver); } if(al_bgdata.size() < 1) { try { Thread.sleep(1000); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); } continue; } Thread.sleep(3000); BattData_RT_RamDB_Thread_SQL.updateServerState_RamDB_Table(m_conn_pool); } catch (InterruptedException e) { // TODO Auto-generated catch block } catch (Exception e) { logger.error(e.toString(), e); } } iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -36,6 +36,7 @@ import com.battdata_rt.BattData_RT; import com.battdata_rt.BattData_RT_Array; import com.dec.fbs9100.FBS9100_TestTime; import com.mysql.jdbc.exceptions.MySQLTimeoutException; /****************************************************************************************************/ public class BTS_61850_SocketClient extends Thread { @@ -246,6 +247,7 @@ FBS9100_Task_Thread_SQL.queryFBS9100SysParamBydev_id(m_ConnPool, m_StatAndParam); // 查询系统参数 FBS9100_Task_Thread_SQL.queryDev6185AlmParamBydev_id(m_ConnPool, m_StatAndParam); // 查询告警参数 } } @@ -520,11 +522,11 @@ break; } // ---------------------------------------------------------------------------------// } catch (InterruptedException e) { logger.error(e.toString(), e); } catch (Exception e) { try { logger.error("IP:" + FBSDeviceIp + " " + this.getName() + " - BTS_IEC61850_ClientThread Connect Break Now By " + e.toString(), e); sleep(1000); break; } catch (InterruptedException e1) { // TODO Auto-generated catch block logger.error(e1.toString(), e1); @@ -540,9 +542,9 @@ //m_ServerModel = null; } catch (Exception e) { logger.error(e.toString(), e); } finally { logger.error("IP:" + FBSDeviceIp + " " + this.getName() + " - BTS_IEC61850_ClientThread Connect Stopped ..."); } logger.debug("IP:" + FBSDeviceIp + " " + this.getName() + " - BTS_IEC61850_ClientThread Stopped ..."); } // 离线养护计划 iec61850_forFoShanAES_Model/src/com/dec/fbs9100/FBS9100_Task_Thread_SQL.java
@@ -655,8 +655,9 @@ { String sql_str = "SELECT * FROM " + Sql_Mysql.FBS9100SetParam_Table; Sql_Mysql sql = new Sql_Mysql(con_pool); ResultSet res = sql.sqlMysqlQuery(sql_str); ResultSet res = null; try { res = sql.sqlMysqlQuery(sql_str); while(res.next()) { FBS9100_StatAndParam param = null; @@ -688,7 +689,6 @@ } } } catch (SQLException e) { // TODO Auto-generated catch block sql.logger.error("FBS9100_Task_Thread_SQL.queryFbs9100SetParam():" + e.toString(), e); } finally { if(null != res) { @@ -712,8 +712,9 @@ { String sql_str = "SELECT * FROM " + Sql_Mysql.FBS9100SetParam_Table + " where dev_id = " + param.dev_id; Sql_Mysql sql = new Sql_Mysql(con_pool); ResultSet res = sql.sqlMysqlQuery(sql_str); ResultSet res = null; try { res = sql.sqlMysqlQuery(sql_str); if(res.next()) { if(null != param) { @@ -820,8 +821,9 @@ //System.out.println(param.dev_id); String sql_str = "SELECT * FROM " + Sql_Mysql.FBS9100SetDLParam_Table + " where dev_id = " + param.dev_id; Sql_Mysql sql = new Sql_Mysql(con_pool); ResultSet res = sql.sqlMysqlQuery(sql_str); ResultSet res = null; try { res = sql.sqlMysqlQuery(sql_str); if(res.next()) { if(null != param) { @@ -1301,8 +1303,9 @@ public static void queryFBS9100SysParamBydev_id(MysqlConnPool con_pool, FBS9100_StatAndParam param) { String sql_str = "SELECT * FROM " + Sql_Mysql.FBS9100SysParam_Table + " where dev_id = " + param.dev_id; Sql_Mysql sql = new Sql_Mysql(con_pool); ResultSet res = sql.sqlMysqlQuery(sql_str); ResultSet res = null; try { res = sql.sqlMysqlQuery(sql_str); if(res.next()) { if(null != param) { @@ -1525,9 +1528,10 @@ public static void queryBTS61850OffLineyhPlanOnRam(MysqlConnPool m_ConnPool, FBS9100_StatAndParam param) { String sql_str = " SELECT * FROM " + Sql_Mysql.FBS9100_offlineyhplan + " WHERE dev_id = " + param.dev_id ; Sql_Mysql sql = new Sql_Mysql(m_ConnPool); ResultSet res = sql.sqlMysqlQuery(sql_str); BTS61850_OffLineYHPlan plan = param.bts61850_OffLineYHPlan; ResultSet res = null; try { res = sql.sqlMysqlQuery(sql_str); if(res.next()) { plan.OffLineYH_Cycle = res.getInt("OffLineYH_Cycle"); plan.OffLineYHOnceCycle = res.getInt("OffLineYHOnceCycle"); @@ -1730,8 +1734,10 @@ public static void queryDev6185AlmParamBydev_id(MysqlConnPool con_pool, FBS9100_StatAndParam param) { String sql_str = "SELECT * FROM " + Sql_Mysql.Dev_6185_AlmParam + " where dev_id = " + param.dev_id; Sql_Mysql sql = new Sql_Mysql(con_pool); ResultSet res = sql.sqlMysqlQuery(sql_str); ResultSet res = null; try { res = sql.sqlMysqlQuery(sql_str); if(res.next()) { if(null != param) { iec61850_forFoShanAES_Model/src/com/dec/fbs9100/main_BTS_APP_IEC61850.java
@@ -29,7 +29,7 @@ /**************************************************************************/ /**************************************************************************/ public final static boolean app_debug = false; public final static double m_VersionNum = 6.107; public final static double m_VersionNum = 6.108; public final static String m_Version = "Welcome To Use BattMonitor_BTS_IEC61850 V" + m_VersionNum + " RC_20201003"; /**************************************************************************/ iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -3,6 +3,9 @@ 注意当前版本在设置紫晶组2的61850协转签名时用的 BTSE/ V6.108 edit by lijun @ 2024-09-06 1.修复通信线程，MSQL抛出异常导致线程异常结束bug V6.107 edit by lijun @ 2024-08-12 1.新增放电历史数据清洗逻辑，针对于放电测试数据末尾测试电流 < 平均电流*0.8的历史数据移动到数据清洗表中
