Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterMan...

lxw

2022-12-02 b0dd3c0fb9a2ff0666b27e6677ff7411245d334f

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterManager

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

@@ -1,5 +1,6 @@
package com.whyc.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.whyc.pojo.BattgroupData;
import com.whyc.pojo.BattgroupInfo;
import com.whyc.pojo.FileParam;
@@ -26,6 +27,10 @@
    private int resGoodCount;
    private int volGoodCount;
    private int chainResGoodCount;

    private int battVolTestCount;
    private int battResTestCount;
    private int battChainResTestCount;

    public List<BattgroupData> getDataList() {
        return dataList;
@@ -122,4 +127,28 @@
    public void setStdDevBs(String stdDevBs) {
        this.stdDevBs = stdDevBs;
    }

    public int getBattVolTestCount() {
        return battVolTestCount;
    }

    public void setBattVolTestCount(int battVolTestCount) {
        this.battVolTestCount = battVolTestCount;
    }

    public int getBattResTestCount() {
        return battResTestCount;
    }

    public void setBattResTestCount(int battResTestCount) {
        this.battResTestCount = battResTestCount;
    }

    public int getBattChainResTestCount() {
        return battChainResTestCount;
    }

    public void setBattChainResTestCount(int battChainResTestCount) {
        this.battChainResTestCount = battChainResTestCount;
    }
}

 src/main/java/com/whyc/service/BattGroupDataService.java

@@ -86,22 +86,22 @@
            Float bv =  Float.parseFloat(data.getBv());
            Float cr =  Float.parseFloat(data.getCr()); //连接条阻抗

            if(bv < finalVolLowCoeK){
            if(bv!=0.0 && bv < finalVolLowCoeK){
                data.setLowVolFlag(true);
            }else if(bv > finalVolHighCoeK){
                data.setHighVolFlag(true);
            }

            if(br > stdRes*resGoodCoeK3/100){
                if(br > stdRes*resBadCoeK4/100){
            if(br >= stdRes*resGoodCoeK3/100){
                if(br >= stdRes*resBadCoeK4/100){
                    data.setHighResFlag2(true);
                }else{
                    data.setHighResFlag1(true);
                }
            }

            if(cr > chainRes*param2.getChainResCoeK5()/100){
                if(cr > chainRes*param2.getChainResChange()/100) {
            if(cr >= chainRes*param2.getChainResCoeK5()/100){
                if(cr >= chainRes*param2.getChainResChange()/100) {
                    data.setHighChainResFlag2(true);
                }else {
                    data.setHighChainResFlag1(true);

 src/main/java/com/whyc/service/ExcelExportService.java

@@ -46,31 +46,56 @@
        int resGoodCount = 0;
        int volGoodCount = 0;
        int chainResGoodCount = 0;
        //总体评价:有效的电阻/电压/连接条 数
        int battVolTestCount = 0;
        int battResTestCount = 0;
        int battChainResTestCount = 0;
        FileParam fileParam = info.getFileParam();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        fileParam.setTestTimeStr(format.format(fileParam.getTestTime()));
        List<BattgroupData> dataList = info.getDataList();
        for(BattgroupData data : dataList){
            //计算电压,内阻,连接条数值是否有效,被测试过
            float bv = Float.parseFloat(data.getBv());
            float br = Float.parseFloat(data.getBr());
            float cr = Float.parseFloat(data.getCr());
            if (bv!=0.0){
                battVolTestCount++;
            }
            if(br!=0.0){
                battResTestCount++;
            }
            if (cr!=0.0){
                battChainResTestCount++;
            }

            data.setMonNumStr("#"+data.getMonNum());
            if(!data.isHighResFlag1() && !data.isHighResFlag2()){
            if(br==0.0){
                data.setResEvaluation("—");
            }
            else if(!data.isHighResFlag1() && !data.isHighResFlag2()){
                resGoodCount +=1;
                data.setResEvaluation("优");
            }else if(data.isHighResFlag1()){
                data.setResEvaluation("差");
                data.setResEvaluation("良");
            }else{
                data.setResEvaluation("很差");
                data.setResEvaluation("差");
            }
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
            if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
            if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };
        info.setResGoodCount(resGoodCount);
        info.setVolGoodCount(volGoodCount);
        info.setChainResGoodCount(chainResGoodCount);

        info.setBattVolTestCount(battVolTestCount);
        info.setBattResTestCount(battResTestCount);
        info.setBattChainResTestCount(battChainResTestCount);

        StationInfo stationInfo = info.getStationInfo();
        if(stationInfo!=null) {
@@ -186,20 +211,43 @@
        int resGoodCount = 0;
        int volGoodCount = 0;
        int chainResGoodCount = 0;

        //总体评价:有效的电阻/电压/连接条 数
        int battVolTestCount = 0;
        int battResTestCount = 0;
        int battChainResTestCount = 0;

        for(BattgroupData data : dataList2){
            //计算电压,内阻,连接条数值是否有效,被测试过
            float bv = Float.parseFloat(data.getBv());
            float br = Float.parseFloat(data.getBr());
            float cr = Float.parseFloat(data.getCr());
            if (bv!=0.0){
                battVolTestCount++;
            }
            if(br!=0.0){
                battResTestCount++;
            }
            if (cr!=0.0){
                battChainResTestCount++;
            }

            data.setMonNumStr("#"+data.getMonNum());
            if(!data.isHighResFlag1() && !data.isHighResFlag2()){
            if(br==0.0){
                data.setResEvaluation("—");
            }
            else if(!data.isHighResFlag1() && !data.isHighResFlag2() ){
                resGoodCount +=1;
                data.setResEvaluation("优");
            }else if(data.isHighResFlag1()){
                data.setResEvaluation("差");
                data.setResEvaluation("良");
            }else{
                data.setResEvaluation("很差");
                data.setResEvaluation("差");
            }
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
            if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
            if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };
@@ -207,6 +255,10 @@
        map.put("volGoodCount",volGoodCount);
        map.put("chainResGoodCount",chainResGoodCount);

        map.put("battVolTestCount",battVolTestCount);
        map.put("battResTestCount",battResTestCount);
        map.put("battChainResTestCount",battChainResTestCount);

        map.put("dataList",dataList);
        map.put("dataList2",dataList2);


 src/main/resources/excel_templates/res_test_report_compare_template.xls

Binary files differ

 src/main/resources/excel_templates/res_test_report_single_template.xls

Binary files differ