whycxzp
2022-11-17 83d2a2e0b10ed7e17dffc997d259a42b5f45260d
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);
                }
            }
        });