测试参数-高低压电压增加1.2v和6v,内阻更换

whycxzp

2022-11-17 83d2a2e0b10ed7e17dffc997d259a42b5f45260d

测试参数-高低压电压增加1.2v和6v,内阻更换

 src/main/java/com/whyc/pojo/BattgroupData.java

@@ -68,7 +68,11 @@
    @ApiModelProperty("内阻高严重告警")
    private boolean highResFlag2;
    @TableField(exist = false)
    private boolean highChainResFlag;
    @ApiModelProperty("连接条告警标识")
    private boolean highChainResFlag1;
    @TableField(exist = false)
    @ApiModelProperty("连接条更换标识")
    private boolean highChainResFlag2;

    @TableField(exist = false)
    @ApiModelProperty("评价")

 src/main/java/com/whyc/pojo/TestParam.java

@@ -32,6 +32,7 @@
    private Float resBadCoeK4;
    @TableField(value = "chain_res_coe_k5")
    private Float chainResCoeK5;
    private Float chainResChange;
    @ApiModelProperty("启用")
    private Integer enabled;

@@ -138,4 +139,12 @@
    public void setVol6HighCoeK2(Float vol6HighCoeK2) {
        this.vol6HighCoeK2 = vol6HighCoeK2;
    }

    public Float getChainResChange() {
        return chainResChange;
    }

    public void setChainResChange(Float chainResChange) {
        this.chainResChange = chainResChange;
    }
}

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

@@ -54,14 +54,24 @@
            info.setDataList(dataList);
            return info;
        }
        Float stdVol = param.getBattVol();
        //Float stdVol = param.getBattVol();
        Float stdRes = param.getBattRes();
        Float volLowCoeK1 = null;
        Float volHighCoeK2 = null;
        //电压不同,电压阈值不同
        if(param.getBattVol() == 2){
            volLowCoeK1 = param2.getVol2LowCoeK1();
            volHighCoeK2 = param2.getVol2HighCoeK2();
        }else{
        }
        else if(param.getBattVol() == 1.2){
            volLowCoeK1 = param2.getVol1d2LowCoeK1();
            volHighCoeK2 = param2.getVol1d2HighCoeK2();
        }
        else if(param.getBattVol() == 6){
            volLowCoeK1 = param2.getVol6LowCoeK1();
            volHighCoeK2 = param2.getVol6HighCoeK2();
        }
        else{
            volLowCoeK1 = param2.getVol12LowCoeK1();
            volHighCoeK2 = param2.getVol12HighCoeK2();
        }
@@ -82,16 +92,20 @@
                data.setHighVolFlag(true);
            }

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

            if(cr > chainRes*param2.getChainResCoeK5()){
                data.setHighChainResFlag(true);
            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

@@ -64,7 +64,7 @@
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag()){
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };
@@ -197,7 +197,7 @@
            if(!data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }
            if(!data.isHighChainResFlag()){
            if(!data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }
        };