lxw
2022-10-26 0819641a8be15c0edb49305e4eb024bc375142b9
修改文件信息
5个文件已修改
34 ■■■■ 已修改文件
res.db 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/XmlFileOpreate.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/BattgroupData.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattGroupDataService.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/FileParamService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
res.db
Binary files differ
src/main/java/com/whyc/dto/XmlFileOpreate.java
@@ -116,13 +116,13 @@
                    BattgroupData battData=new BattgroupData();
                    battData.setMonNum(Integer.parseInt(file_node.attributeValue("batt_num")));
                    batt_node=file_node.element("bv_1");
                    battData.setBv(Float.parseFloat(batt_node.getTextTrim()));
                    battData.setBv(batt_node.getTextTrim());
                    batt_node=file_node.element("br_1");
                    battData.setBr(Float.parseFloat(batt_node.getTextTrim()));
                    battData.setBr(batt_node.getTextTrim());
                    batt_node=file_node.element("bs_1");
                    battData.setBs(Float.parseFloat(batt_node.getTextTrim()));
                    battData.setBs(batt_node.getTextTrim());
                    batt_node=file_node.element("cr_1");
                    battData.setCr(Float.parseFloat(batt_node.getTextTrim()));
                    battData.setCr(batt_node.getTextTrim());
                    batt_node=file_node.element("er_1");
                    battData.setEr(Integer.parseInt(batt_node.getTextTrim()));
                    battDataList.add(battData);
src/main/java/com/whyc/pojo/BattgroupData.java
@@ -41,16 +41,16 @@
    private Integer monNum;
    @ApiModelProperty(value = "电压(V)")
    private Float bv;
    private String bv;
    @ApiModelProperty(value = "内阻(mΩ)")
    private Float br;
    private String br;
    @ApiModelProperty(value = "电导")
    private Float bs;
    private String bs;
    @ApiModelProperty(value = "连接条阻抗(mΩ)")
    private Float cr;
    private String cr;
    @ApiModelProperty(value = "异常标记 0:无异常 1:鼓包 2:漏液 4:开裂 8:内阻超标")
    private int er;
src/main/java/com/whyc/service/BattGroupDataService.java
@@ -62,9 +62,9 @@
        Float chainRes = param.getChainRes();
        dataList.forEach(data->{
            //判断处理阈值
            Float br = data.getBr();
            Float bv = data.getBv();
            Float cr = data.getCr(); //连接条阻抗
            Float br =  Float.parseFloat(data.getBr());
            Float bv =  Float.parseFloat(data.getBv());
            Float cr =  Float.parseFloat(data.getCr()); //连接条阻抗
            if(bv < stdVol*volLowCoeK1){
                data.setLowVolFlag(true);
@@ -143,8 +143,8 @@
            }
            if(baseData!=null){
                //进行内阻和电压变化率计算
                Float br = data.getBr();
                Float baseBr = baseData.getBr();
                Float br =  Float.parseFloat(data.getBr());
                Float baseBr =  Float.parseFloat(baseData.getBr());
                if(baseBr == 0.0f){
                    if(br == 0.0f){
                        resChangeRate.add("0.0%");
@@ -156,8 +156,8 @@
                    resChangeRate.add(brFloat * 10000/100 + "%");
                }
                Float bv = data.getBv();
                Float baseBv = baseData.getBv();
                Float bv =  Float.parseFloat(data.getBv());
                Float baseBv =  Float.parseFloat(baseData.getBv());
                if(baseBv == 0.0f){
                    if(bv == 0.0f){
                        volChangeRate.add("0.0%");
src/main/java/com/whyc/service/FileParamService.java
@@ -177,8 +177,8 @@
                                listBr.add(bData.getBr());
                                listBs.add(bData.getBs());
                                listCr.add(bData.getCr());
                                if(bData.getBr()<=minStd){
                                    minStd=bData.getBr();
                                if( Float.parseFloat(bData.getBr())<=minStd){
                                    minStd= Float.parseFloat(bData.getBr());
                                }
                            }
                            binfo.setSdBasebv(MathUtil.getStandardDeviation(listBv));