V2.103 edit by lijun @ 2024-04-08 1.修复前一版本核容参数中的组端下限和核容时长读取的点位为第一组的参数bug

DELL

2024-04-08 978500ef65c4ebd082eeb1af4a57d35a0682e554

V2.103 edit by lijun    @  2024-04-08
	1.修复前一版本核容参数中的组端下限和核容时长读取的点位为第一组的参数bug

 iec61850_forFoShanAES_Model/bin/com/battdata_rt/BattData_RT_RamDB_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

@@ -5,6 +5,9 @@
     

    注意当前版本在设置南瑞的61850协转签名时用的     BTSE2/

    

V2.103 edit by lijun    @  2024-04-08

    1.修复前一版本核容参数中的组端下限和核容时长读取的点位为第一组的参数bug

	
V2.102 edit by lijun    @  2023-08-16

    1.当前版本修改为南瑞协转的通信程序    

    2.兼容正常1托2和常规1托2

@@ -12,6 +15,7 @@
    4.兼容通过南瑞协转读取的核容时长和组端下限异常bug

    

    

	
V6.102 edit by lijun    @  2023-08-16

    1.修复工厂内部组2读取参数"核容时长"和"组端下限"点位目前仍然读取的组1上的参数切记

    2.新增远程同步时间功能


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

@@ -1003,7 +1003,7 @@
                    logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsBtseYx)", FBSDeviceName);

                    //-------------------------------------------------------------------------------------//

                    String c[] = null;

                    DataSet ds_stat = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYx");

                    DataSet ds_stat = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYx").copy();

                    int size_cnt_stat = ds_stat.getMembers().size();

                    boolean[] alm  = new boolean[] {false,false,false,false,false};

                    int size_cnt = ds_stat.getMembers().size();

@@ -1069,7 +1069,7 @@
                    logger.printf(Level.TRACE, "m_ServerModel.getDataSet(%s/LLN0.dsDevState )", FBSDeviceName);

                    //-------------------------------------------------------------------------------------//

                    comm_res = true;

                    DataSet ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsDevState");

                    DataSet ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsDevState").copy();

                    if(null == ds) {

                        //兼容老版本协转数据

                        ds = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc");                        

@@ -1211,7 +1211,7 @@
                //-------------------------------------------------------------------------------------//

                comm_res = true;

            } else if (FBS9100_ComBase.CMD_GetDischargeParm == cmd) {

                DataSet ds_pm = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc");

                DataSet ds_pm = m_ServerModel.getDataSet(FBSDeviceName + "/LLN0.dsBtseYc").copy();

                if(null != ds_pm && null !=  ds_pm.getMembers()) {

                    int size_cnt = ds_pm.getMembers().size();

                    m_Association.getDataSetValues(ds_pm);

@@ -1266,17 +1266,16 @@
                            //System.out.println(fc_model_str);

                        }

                    }

                    if(0 == m_FBS_DiscParamFromDev.GroupVol_LOW) {

                        //测试时长

                        m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);

                        //组端下限

                        m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);

                    }

                    if(0 == m_FBS_DiscParamFromDev.GroupVol_LOW) {

                        //测试时长

                    if(FBSDeviceName.contains("BTSE2")) {

                        //测试时长[第二套]

                        m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO2.HiTestTmhour.mag.f", Fc.MX)*60);

                        //组端下限

                        m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO2.LoBatVal.mag.f", Fc.MX);

                    }else{

                        //测试时长[第一套]

                        m_FBS_DiscParamFromDev.DisTime = (int)(readFloatNodeData(ZJDYCPSS + "/cheGGIO1.HiTestTmhour.mag.f", Fc.MX)*60);

                        //组端下限

                        m_FBS_DiscParamFromDev.GroupVol_LOW = readFloatNodeData(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f", Fc.MX);

                    }

                    

                    ds_pm = null;


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

@@ -30,7 +30,7 @@
    /**************************************************************************/

    /**************************************************************************/

    public final static boolean app_debug = false;

    public final static double m_VersionNum = 2.102;

    public final static double m_VersionNum = 2.103;

    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

@@ -5,6 +5,9 @@
     

    注意当前版本在设置南瑞的61850协转签名时用的     BTSE2/

    

V2.103 edit by lijun    @  2024-04-08

    1.修复前一版本核容参数中的组端下限和核容时长读取的点位为第一组的参数bug

	
V2.102 edit by lijun    @  2023-08-16

    1.当前版本修改为南瑞协转的通信程序    

    2.兼容正常1托2和常规1托2

@@ -12,6 +15,7 @@
    4.兼容通过南瑞协转读取的核容时长和组端下限异常bug

    

    

	
V6.102 edit by lijun    @  2023-08-16

    1.修复工厂内部组2读取参数"核容时长"和"组端下限"点位目前仍然读取的组1上的参数切记

    2.新增远程同步时间功能