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

DELL

2024-04-08 978500ef65c4ebd082eeb1af4a57d35a0682e554

 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;