iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.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/version_inf/version_inf.txt
@@ -5,7 +5,7 @@ 注意当前版本在设置南瑞的61850协转签名时用的 BTSE2/ V2.1043 edit by lijun @ 2024-07-24 V2.104 edit by lijun @ 2024-07-24 1.兼容读取紫晶锂电BTS核容数据 V2.103 edit by lijun @ 2024-04-08 iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java
@@ -102,6 +102,7 @@ } boolean batt_group_exist = false; String reg_code = res.getString("BattGroupName6").trim(); String FBSDeviceName = res.getString("FBSDeviceName").trim(); float float_vol_lev = res.getFloat("FloatVolLevel"); float float_curr_lev = res.getFloat("BattFloatCurrent"); int GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice"); @@ -120,6 +121,10 @@ brt.setDevRegCode(reg_code); param_changed = true; } if(false == FBSDeviceName.equals(brt.FBSDeviceName)) { brt.FBSDeviceName = FBSDeviceName; param_changed = true; } if((float_vol_lev!=brt.getBattFloatVolLev()) || (float_curr_lev!=brt.getBattFloatCurrLev())) { brt.setBattFloatVolCurrLevel(float_vol_lev, float_curr_lev); param_changed = true; iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java
@@ -217,25 +217,29 @@ System.out.println("successfully read model"); */ /************************* read m_DevVersion first *************************/ m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC); /***************************************************************************/ logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion); m_FBS_VCData.m_SysState.resetErrCommCount(); FBS9100_Task_Thread_SQL.inseartOrUpdateFBS9100SFODParam(m_ConnPool, m_StatAndParam.clParam, m_StatAndParam); try { /************************* read m_DevVersion first *************************/ m_StatAndParam.m_DevVersion = readVersionStringNodeData(FBSDeviceName + "/ncdGGIO1.DevVersion.d", Fc.DC); /***************************************************************************/ logger.debug("IP:" + FBSDeviceIp + " - BTS_IEC61850_VersionInf: " + m_StatAndParam.m_DevVersion); m_FBS_VCData.m_SysState.resetErrCommCount(); FBS9100_Task_Thread_SQL.inseartOrUpdateFBS9100SFODParam(m_ConnPool, m_StatAndParam.clParam, m_StatAndParam); FBS9100_Task_Thread_SQL.queryBTS61850OffLineyhPlanOnRam(m_ConnPool, m_StatAndParam); m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC); m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC); //唯一序列号 BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam); //更新当前参数 //读取主从机功能使能 m_FBS_VCData.m_SysState.MasterSlave_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn29.mag.f",Fc.MX)); //读取干接点功能使能 m_FBS_VCData.m_SysState.DryContact_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn30.mag.f",Fc.MX)); FBS9100_Task_Thread_SQL.queryBTS61850OffLineyhPlanOnRam(m_ConnPool, m_StatAndParam); m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC); m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC); //唯一序列号 BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam); //更新当前参数 //读取主从机功能使能 m_FBS_VCData.m_SysState.MasterSlave_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn29.mag.f",Fc.MX)); //读取干接点功能使能 m_FBS_VCData.m_SysState.DryContact_en = (int) (readFloatNodeData(FBSDeviceName + "/btgGGIO1.AnIn30.mag.f",Fc.MX)); } catch (Exception e2) { logger.error(e2.toString(), e2); } while (true == Get_AppAliveState()) { try { @@ -462,13 +466,11 @@ break; } // ---------------------------------------------------------------------------------// } catch (InterruptedException e) { } catch (Exception e) { logger.error(e.toString(), e); try { sleep(1000); } catch (InterruptedException e1) { // TODO Auto-generated catch block logger.error(e1.toString(), e1); } } 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; @@ -712,8 +713,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 +822,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) { @@ -1299,8 +1302,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) { @@ -1329,6 +1333,13 @@ } catch (SQLException e) { sql.logger.error("FBS9100_Task_Thread_SQL.queryFBS9100SysParamBydev_id():" + e.toString(), e); } finally { if(null != res) { try { res.close(); } catch (SQLException e) { sql.logger.error("FBS9100_Task_Thread_SQL.queryFBS9100SysParamBydev_id():" + e.toString(), e); } } sql.close_con(); } } @@ -1515,9 +1526,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"); @@ -1532,6 +1544,13 @@ } catch (SQLException e) { sql.logger.error("FBS9100_Task_Thread_SQL.queryBTS61850OffLineyhPlanOnRam():" + e.toString(), e); } finally { if(null != res) { try { res.close(); } catch (SQLException e) { e.printStackTrace(); } } sql.close_con(); } } iec61850_forFoShanAES_Model/src/com/version_inf/version_inf.txt
@@ -5,7 +5,7 @@ 注意当前版本在设置南瑞的61850协转签名时用的 BTSE2/ V2.1043 edit by lijun @ 2024-07-24 V2.104 edit by lijun @ 2024-07-24 1.兼容读取紫晶锂电BTS核容数据 V2.103 edit by lijun @ 2024-04-08
