修复参数读取bug

DELL

2024-02-29 bb2a18a65c2d682a3b0c18d3afc5c2cad9735ff1

修复参数读取bug

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

Binary files differ

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

@@ -1180,12 +1180,12 @@
                //-------------------------------------------------------------------------------------//

                comm_res = true;

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

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

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

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

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

                    m_Association.getDataSetValues(ds_pm);

                    //logger.printf(Level.DEBUG, "开始读取放电参数");

                    for (int n = 0; n < size_cnt && n < 10; n++) {

                    for (int n = 0; n < size_cnt; n++) {

                        if(null == ds_pm.getMembers().get(n).getChild("mag")) {

                            continue;

                        }

@@ -1194,6 +1194,7 @@
                        BasicDataBind<?> data = new Float32DataBind((BdaFloat32) fc_mode);

                        JTextField tf_t = (JTextField) data.getValueField();

                        String fc_model_str = fc_mode.toString1();

                        System.out.println(fc_model_str+"==:"+tf_t.getText());

                        if (fc_model_str.contains(FBSDeviceName + "/ncdGGIO1.TestCurr.mag.f")) {

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

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

@@ -1229,10 +1230,12 @@
                    ds_pm = null;

                }else {

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

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

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

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

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

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

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

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

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

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

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

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