2024-9-19bug修改

whyclxw

2024-09-19 e69df3cbc963522856846cb62ae1874ccb63ee8c

2024-9-19bug修改

 src/main/java/com/whyc/dto/XmlFileOpreate.java

@@ -133,12 +133,12 @@
                        esCap=battRes/Float.valueOf(br);
                    }
                    battData.setEstimatedCap(esCap*battCap);*/
                    float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
                    /* float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
                    //容量百分比修改
                    battData.setPreCapPercent(preCapPercent);
                    //预估容量
                    battData.setEstimatedCap(preCapPercent*battCap);
                   /* //内阻偏差率设置默认值为0
                   //内阻偏差率设置默认值为0
                    if(battRes==0){
                        battData.setResDevRate(Float.POSITIVE_INFINITY);
                    }else{
@@ -194,6 +194,11 @@
            for (BattgroupData battData:battInfo.getBattDataList()) {
                float resDevRate=(Float.valueOf(battData.getBr())-effRes)/effRes;
                battData.setResDevRate(resDevRate);
                float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(battData.getBr()),effRes);
                //容量百分比修改
                battData.setPreCapPercent(preCapPercent);
                //预估容量
                battData.setEstimatedCap(preCapPercent*battCap);
            }
            fileInfo.setFileParam(fparam);
            fiso.close();
@@ -332,7 +337,7 @@
                            esCap=battRes/Float.valueOf(br);
                        }
                        battData.setEstimatedCap(esCap*battCap);*/
                        float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
                        /*float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(br),battRes);
                        //容量百分比修改
                        battData.setPreCapPercent(preCapPercent);
                        //预估容量
@@ -343,7 +348,7 @@
                        }else{
                            float resDevRate=(Float.valueOf(br)-battRes)/battRes;
                            battData.setResDevRate(resDevRate);
                        }
                        }*/

                        batt_node=file_node.element("bs_1");
                        battData.setBs(batt_node.getTextTrim());
@@ -397,6 +402,11 @@
                    for (BattgroupData battData:battInfo.getBattDataList()) {
                        float resDevRate=(Float.valueOf(battData.getBr())-effRes)/effRes;
                        battData.setResDevRate(resDevRate);
                        float preCapPercent=MathUtil.getPreCapTest(Float.valueOf(battData.getBr()),effRes);
                        //容量百分比修改
                        battData.setPreCapPercent(preCapPercent);
                        //预估容量
                        battData.setEstimatedCap(preCapPercent*battCap);
                    }
                }
            }