单数据导出逻辑更换

PerryHsu

2022-12-26 0723f31c8823e51449bd2e34f4b26a75f9e9cd2b

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

@@ -9,6 +9,7 @@
import com.whyc.pojo.BattgroupData;
import com.whyc.pojo.FileParam;
import com.whyc.pojo.StationInfo;
import com.whyc.pojo.TestParam;
import com.whyc.util.MathUtil;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@
    @Autowired
    private StationInfoService stationInfoService;

    @Autowired
    private TestParamService testParamService;

    public void resTestReport(BattGroupStationInfoWithFileParam info, HttpServletResponse response) throws IOException {
        HashMap<String, Object> map = Maps.newHashMap();
        //总体评价:内阻/电压/连接条/?容量
@@ -50,10 +54,41 @@
        int battVolTestCount = 0;
        int battResTestCount = 0;
        int battChainResTestCount = 0;
        FileParam fileParam = info.getFileParam();
        FileParam param = info.getFileParam();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        fileParam.setTestTimeStr(format.format(fileParam.getTestTime()));
        param.setTestTimeStr(format.format(param.getTestTime()));
        //查询全局的测试系数和参数
        TestParam param2 = testParamService.getFactorsAndThreshold();
        //判断测试数据告警范围
        Float stdRes = param.getBattRes();
        Float volLowCoeK1 = null;
        Float volHighCoeK2 = null;
        //电压不同,电压阈值不同
        if(param.getBattVol() == 2){
            volLowCoeK1 = param2.getVol2LowCoeK1();
            volHighCoeK2 = param2.getVol2HighCoeK2();
        }
        else if(param.getBattVol() == 1.2){
            volLowCoeK1 = param2.getVol1d2LowCoeK1();
            volHighCoeK2 = param2.getVol1d2HighCoeK2();
        }
        else if(param.getBattVol() == 6){
            volLowCoeK1 = param2.getVol6LowCoeK1();
            volHighCoeK2 = param2.getVol6HighCoeK2();
        }
        else if(param.getBattVol() == 12){
            volLowCoeK1 = param2.getVol12LowCoeK1();
            volHighCoeK2 = param2.getVol12HighCoeK2();
        }else{ //电压非常规值,则默认设置为2v的电压阈值
            volLowCoeK1 = param2.getVol2LowCoeK1();
            volHighCoeK2 = param2.getVol2HighCoeK2();
        }
        Float resGoodCoeK3 = param2.getResGoodCoeK3();
        Float resBadCoeK4 = param2.getResBadCoeK4();
        Float chainRes = param.getVersion().toUpperCase().contains("V2.0")?param.getChainRes():param.getConnRes();
        Float finalVolLowCoeK = volLowCoeK1;
        Float finalVolHighCoeK = volHighCoeK2;
        List<BattgroupData> dataList = info.getDataList();
        for(BattgroupData data : dataList){
            //计算电压,内阻,连接条数值是否有效,被测试过
@@ -74,18 +109,36 @@
            if(br==0.0){
                data.setResEvaluation("—");
            }
            else if(!data.isHighResFlag1() && !data.isHighResFlag2()){
            /*else if(!data.isHighResFlag1() && !data.isHighResFlag2()){
                resGoodCount +=1;
                data.setResEvaluation("优");
            }else if(data.isHighResFlag1()){
                data.setResEvaluation("良");
            }else{
                data.setResEvaluation("差");
            }*/
            else if(br >= stdRes*resGoodCoeK3/100){
                if(br >= stdRes*resBadCoeK4/100){
                    // data.setHighResFlag2(true);
                    data.setResEvaluation("差");
                }else{
                    // data.setHighResFlag1(true);
                    data.setResEvaluation("良");
                }
            }else{
                resGoodCount +=1;
                data.setResEvaluation("优");
            }
            if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
            /*if(bv!=0.0 && !data.isLowVolFlag() && !data.isHighVolFlag()){
                volGoodCount +=1;
            }*/
            if(bv!=0.0 && bv > finalVolLowCoeK && bv < finalVolHighCoeK){
                volGoodCount +=1;
            }
            if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
            /*if(cr!=0.0 && !data.isHighChainResFlag1() && !data.isHighChainResFlag2()){
                chainResGoodCount +=1;
            }*/
            if(cr!=0.0 && cr < chainRes*param2.getChainResCoeK5()/100){
                chainResGoodCount +=1;
            }
        };