V6.109 edit by lijun @ 2025-01-15 1.设备遥调遥控需要先绑定设备Ukey上的UkeyID[可通过网页工具，或者...

DELL

2025-01-14 2c735cefd694ddbadfd7456f5ad27e0e242efb11

V6.109 edit by lijun 	@  2025-01-15
	1.设备遥调遥控需要先绑定设备Ukey上的UkeyID[可通过网页工具，或者ukey调试工具读取]

 iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT.class

Binary files differ

 iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_Array.class

Binary files differ

 iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_Thread_SQL.class

Binary files differ

 iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS61850_Task_Thread_SQL.class

Binary files differ

 iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/BTS_61850_SocketClient.class

Binary files differ

 iec61850_forFoShanAES_Model/bin/com/dec/fbs9100/main_BTS_APP_IEC61850.class

Binary files differ

 iec61850_forFoShanAES_Model/bin/com/version_inf/version_inf.txt

@@ -16,6 +16,9 @@
        ②　若测试过程中设备工作状态为充电测，记录在核容充电里面。否则为监测充电。

        ③　数据结束逻辑为：当前电池电流<(浮充电流阈值+2)



V6.109 edit by lijun     @  2025-01-15

    1.设备遥调遥控需要先绑定设备Ukey上的UkeyID[可通过网页工具，或者ukey调试工具读取]



V6.108 edit by lijun     @  2024-09-06

    1.修复通信线程，MSQL抛出异常导致线程异常结束bug




 iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT.java

@@ -80,7 +80,7 @@
    private float mDataHistoryNewLevel = (float) 0.01;

    private int mTestDataRecordCountMax = 10000;

    

	
    public String ukeyID = "";                            //绑定UKEYID

    public int sign_type = SIGN_TYPE_Default;

    

    Logger logger = null;

@@ -957,6 +957,12 @@
    }

    

    

    public String getUkeyID() {

        return ukeyID;

    }

    public void setUkeyID(String ukeyID) {

        this.ukeyID = ukeyID;

    }

    /**

     *     删除记录

     * @param pool


 iec61850_forFoShanAES_Model/src/com/battdata_rt/BattData_RT_Array.java

@@ -83,7 +83,7 @@
            sql.sqlMysqlUseDB(Sql_Mysql.DB_BATT_INF);

            

            String sql_str = "SELECT DISTINCT "

                            + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,sign_type,"

                            + " FBSDeviceId,FBSDeviceIp,BattGroupName6,GroupIndexInFBSDevice,FBSDeviceName,sign_type,KeyID,"

                            + " BattGroupId,BattGroupNum,MonCount,BattFloatCurrent,FloatVolLevel,MonCapStd,MonVolStd"

                            + " FROM " + Sql_Mysql.BattInf_Table

                            + " WHERE FLOOR(FBSDeviceId/10000)=61850"

@@ -102,6 +102,7 @@
                }

                boolean batt_group_exist = false;

                //String reg_code = res.getString("BattGroupName6").trim();

                String ukeyID = res.getString("KeyID").trim();

                float float_vol_lev = res.getFloat("FloatVolLevel");

                float float_curr_lev = res.getFloat("BattFloatCurrent");

                int GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");

@@ -138,6 +139,10 @@
                            brt.sign_type = sign_type;

                            param_changed = true;

                        }

                        if(ukeyID.equals(brt.getUkeyID())) {

                            brt.ukeyID = ukeyID;

                            param_changed = true;

                        }

                        

                        

                        

@@ -164,7 +169,7 @@
                    //rtdata.setDevRegCode(res.getString("BattGroupName6").trim());

                    rtdata.GroupIndexInFBSDevice = res.getInt("GroupIndexInFBSDevice");

                    rtdata.sign_type = res.getInt("sign_type");

					
                    rtdata.ukeyID = res.getString("KeyID").trim();

                    

                    if(rtdata.GroupIndexInFBSDevice > 3) {

                        rtdata.GroupIndexInFBSDevice = 3;


 iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS61850_Task_Thread_SQL.java

@@ -122,14 +122,14 @@
     */

    public static void UpdateBattInfTable(MysqlConnPool m_ConnPool,FBS9100_StatAndParam param) {

        String sql_str = " UPDATE " + Sql_Mysql.BattInf_Table + ""

                + " SET PublicKeyX = '"+ param.publicKeyX +"',KeyID = '" + param.keyID + "',SerialNumber = '"+param.serialNumber+"'"

                + " SET PublicKeyX = '" + param.publicKeyX /* +"',KeyID = '" + param.keyID */ + "',SerialNumber = '"+param.serialNumber+"'"

                + " WHERE FBSDeviceId = " + param.dev_id;

        

        Sql_Mysql sql = new Sql_Mysql(m_ConnPool);

        try {

            sql.sqlMysqlExecute(sql_str);

        } catch (SQLException e) {

            e.printStackTrace();

            sql.logger.error("BTS61850_Task_Thread_SQL.UpdateBattInfTable():" + e.toString(), e);

        } finally {

            sql.close_con();

        }

@@ -158,4 +158,35 @@
            

        }

    }



    /**

     * 查询设备的uKeyID

     * @param m_ConnPool

     * @param dev_id

     * @return

     */

    public static String queryDeviceUkeyID(MysqlConnPool m_ConnPool, int dev_id) {

        String ukeyID = "";

        String sql_str = "SELECT KeyID FROM " + Sql_Mysql.BattInf_Table+ " WHERE FBSDeviceId = " + dev_id + " LIMIT 1";

        Sql_Mysql sql = new Sql_Mysql(m_ConnPool);

        ResultSet res = null;

        try {

            res = sql.sqlMysqlQuery(sql_str);

            if(res.next()) {

                ukeyID = res.getString("KeyID").trim();

            }

        } catch (SQLException e) {

            e.printStackTrace();

        } finally {

            if(null != res) {

                try {

                    res.close();

                } catch (SQLException e) {

                    sql.logger.error("BTS61850_Task_Thread_SQL.queryDeviceUkeyID():" + e.toString(), e); 
                }

            }

            sql.close_con();

        }

        return ukeyID;

    }

}


 iec61850_forFoShanAES_Model/src/com/dec/fbs9100/BTS_61850_SocketClient.java

@@ -132,6 +132,9 @@
                MonVolStd = AL_RTdata.getItem(n).MonStdVol;

                FBSDeviceName = AL_RTdata.getItem(n).FBSDeviceName;

                m_StatAndParam.BattGroupId = AL_RTdata.getItem(n).BattGroupId;

				
                //

                m_StatAndParam.keyID = AL_RTdata.getItem(n).ukeyID;

                //FBSDeviceIp = AL_RTdata.getItem(n).FBSDeviceIp;

            }

        }

@@ -227,9 +230,9 @@
                

                FBS9100_Task_Thread_SQL.inseartDev_6185_AlmParam(m_ConnPool, m_StatAndParam.dev_id);

                

                m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);

                //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);        //更新当前参数

                //BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam);        //更新当前参数

                

                

                //读取主从机功能使能

@@ -298,8 +301,10 @@
                                

                            

                                //读取一次ukey

                                m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);

                                //m_StatAndParam.keyID = readStringNodeData(FBSDeviceName+"/btgGGIO1.ukeyID.d",Fc.DC);

                                m_StatAndParam.keyID = BTS61850_Task_Thread_SQL.queryDeviceUkeyID(m_ConnPool,m_StatAndParam.dev_id);

                                m_StatAndParam.serialNumber = readStringNodeData(FBSDeviceName+"/btgGGIO1.Bts_ID.d",Fc.DC);                //唯一序列号

                                BTS61850_Task_Thread_SQL.UpdateBattInfTable(m_ConnPool, m_StatAndParam);                                //更新当前参数

                            }

                        } else if (FBS9100_ComBase.CMD_SetIp == m_FBS_DiscParam.op_cmd) {

                            if (true == BTS_IEC61850_SocketComm(FBS9100_ComBase.CMD_SetIp)) {


 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.108;

    public final static double m_VersionNum = 6.109;

    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

@@ -16,6 +16,9 @@
        ②　若测试过程中设备工作状态为充电测，记录在核容充电里面。否则为监测充电。

        ③　数据结束逻辑为：当前电池电流<(浮充电流阈值+2)



V6.109 edit by lijun     @  2025-01-15

    1.设备遥调遥控需要先绑定设备Ukey上的UkeyID[可通过网页工具，或者ukey调试工具读取]



V6.108 edit by lijun     @  2024-09-06

    1.修复通信线程，MSQL抛出异常导致线程异常结束bug