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

@@ -15,6 +15,7 @@
import org.apache.logging.log4j.Level;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

import org.openmuc.openiec61850.BdaBitString;

import org.openmuc.openiec61850.BdaBoolean;

import org.openmuc.openiec61850.BdaFloat32;

import org.openmuc.openiec61850.BdaInt64;

@@ -170,7 +171,10 @@
            logger.debug("BTS_IEC61850_Client Unable to connect to device IP:" + FBSDeviceIp);

            continue;

         }

         if(this.FBSDeviceName.indexOf("BTSE")>0) {

         if(this.FBSDeviceName.indexOf("BTSE2")>0) {

            //适配各个不同协议名称的61850设备通信[读取放电参数时用到]

            ZJDYCPSS = this.FBSDeviceName.replace("BTSE2", "CPSS");

         }else if(this.FBSDeviceName.indexOf("BTSE")>0) {

            //适配各个不同协议名称的61850设备通信[读取放电参数时用到]

            ZJDYCPSS = this.FBSDeviceName.replace("BTSE", "CPSS");

         }

@@ -774,20 +778,9 @@
           m_Association.getDataValues(fcModelNode);  

           m_FBS_VCData.m_SysState.resetErrCommCount();

           ModelNode fc_mode = fcModelNode;

           String a[]= null;

           a = new String[5];

           a = (fc_mode.toString()).split(":");

           res_val = a[2];

           //System.out.println(a[3]);

           String split[]= null;

           split = new String[5];

           split = (res_val.toString()).split(", ");

           String result[]= null;

           result = new String[2];

           result[0] = split[0];

           result[1] = a[3];

        	
           resul = String.format("%s,%s", result);

           if(fc_mode instanceof BdaVisibleString) {

              resul = new String(((BdaVisibleString)fc_mode).getValue());

           }

        } catch (ServiceError e) {

            System.out.println("Service error: " + e.getMessage());

            m_FBS_VCData.m_SysState.addErrCommCount();

@@ -1010,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();

@@ -1076,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");                  

@@ -1218,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);

@@ -1242,6 +1235,11 @@
                     dis_hour_t = dis_hour_t * 60;

                     m_FBS_DiscParamFromDev.DisTime = (int) dis_hour_t;

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

                  }else if (fc_model_str.contains("/cheGGIO2.HiTestTmhour.mag.f")) {

                     float dis_hour_t = Float.parseFloat(tf_t.getText());

                     dis_hour_t = dis_hour_t * 60;

                     m_FBS_DiscParamFromDev.DisTime = (int) dis_hour_t;

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

                  }else if (fc_model_str.contains(FBSDeviceName + "/ncdGGIO1.HiTestBatAh.mag.f")) {

                     m_FBS_DiscParamFromDev.DisCap = Float.parseFloat(tf_t.getText());

                     //m_FBS_DiscParamFromDev.DisCap = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.HiTestBatAh.mag.f", Fc.MX);

@@ -1250,6 +1248,9 @@
                     //m_FBS_DiscParamFromDev.MonomerTmp_High = readFloatNodeData(FBSDeviceName + "/ncdGGIO1.HiCelTemp.mag.f", Fc.MX);

                  // /*兼容点集中的组2参数为组1*/ }else if (fc_model_str.contains(ZJDYCPSS + "/cheGGIO1.LoBatVal.mag.f")) {

                  }else if (fc_model_str.contains("/cheGGIO1.LoBatVal.mag.f")) {

                     m_FBS_DiscParamFromDev.GroupVol_LOW = Float.parseFloat(tf_t.getText());

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

                  }else if (fc_model_str.contains("/cheGGIO2.LoBatVal.mag.f")) {

                     m_FBS_DiscParamFromDev.GroupVol_LOW = Float.parseFloat(tf_t.getText());

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

                  }else if (fc_model_str.contains(FBSDeviceName + "/ncdGGIO1.LoCelVol.mag.f")) {

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

                  }

               }

               //测试时长

               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(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;

            }else {

@@ -2246,6 +2254,17 @@
      boolean[] a  = new boolean[] {false,true,false};

      String format1 = String.format("%b,%b,%b",a[0],a[1],a[2] );

      System.out.println(format1);

		
      String ZJDYCPSS = "";

      String FBSDeviceName = "ZJDYBTSE2";

      if(FBSDeviceName.indexOf("BTSE2")>0) {

         //适配各个不同协议名称的61850设备通信[读取放电参数时用到]

         ZJDYCPSS = FBSDeviceName.replace("BTSE2", "CPSS");

      }else if(FBSDeviceName.indexOf("BTSE")>0) {

         //适配各个不同协议名称的61850设备通信[读取放电参数时用到]

         ZJDYCPSS = FBSDeviceName.replace("BTSE", "CPSS");

      }

      System.out.println(ZJDYCPSS);

   }



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