解析文件加版本加默认值

lxw

2022-11-01 7b7d75d2766c886ddca48b28e78d39ff6b72c026

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

@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.NumberFormat;
import java.text.ParseException;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
@@ -130,10 +131,13 @@
        List<String> resBalanceRateList = data3.get("resBalanceRate");
        List<String> volBalanceRateList = data3.get("volBalanceRate");
        //均一性:chainRes/?容量/bs(电导)
        List<Float> chainResList = dataList2.stream().map(BattgroupData::getCr).collect(Collectors.toList());
        List<Float> bsList = dataList2.stream().map(BattgroupData::getBs).collect(Collectors.toList());
        String chainResBalanceRate = MathUtil.getStandardDeviation(chainResList) * 10000 / 100 + "%";
        String bsBalanceRate = MathUtil.getStandardDeviation(bsList) * 10000 / 100 + "%";
        NumberFormat percentInstance = NumberFormat.getPercentInstance();
        percentInstance.setMinimumFractionDigits(2);

        List<Float> chainResList = dataList2.stream().map(BattgroupData::getCr).map(Float::parseFloat).collect(Collectors.toList());
        List<Float> bsList = dataList2.stream().map(BattgroupData::getBs).map(Float::parseFloat).collect(Collectors.toList());
        String chainResBalanceRate = percentInstance.format(MathUtil.getStandardDeviation(chainResList));
        String bsBalanceRate = percentInstance.format(MathUtil.getStandardDeviation(bsList));
        //获取FileParam和StationInfo
        StationInfo stationInfo = stationInfoService.getByFileId(fileId2);
        FileParam param = fileParamService.getByFileId(fileId2);
@@ -144,18 +148,23 @@
        String testTimeStrBase = format.format(paramBase.getTestTime());
        //图片
        BASE64Decoder decoder = new BASE64Decoder();
        ImageEntity volImage = new ImageEntity();
        volImage.setData(decoder.decodeBuffer(dto.getVolPic().substring(dto.getVolPic().indexOf(",")+1)));
        volImage.setColspan(6);
        volImage.setRowspan(17);
        if(!dto.getVolPic().equals("")) {
            ImageEntity volImage = new ImageEntity();
            volImage.setData(decoder.decodeBuffer(dto.getVolPic().substring(dto.getVolPic().indexOf(",") + 1)));
            volImage.setColspan(6);
            volImage.setRowspan(17);

        ImageEntity resImage = new ImageEntity();
        resImage.setData(decoder.decodeBuffer(dto.getResPic().substring(dto.getResPic().indexOf(",")+1)));
        resImage.setColspan(6);
        resImage.setRowspan(16);
            map.put("volImage",volImage);
        }

        map.put("volImage",volImage);
        map.put("resImage",resImage);
        if(!dto.getResPic().equals("")) {
            ImageEntity resImage = new ImageEntity();
            resImage.setData(decoder.decodeBuffer(dto.getResPic().substring(dto.getResPic().indexOf(",") + 1)));
            resImage.setColspan(6);
            resImage.setRowspan(16);

            map.put("resImage",resImage);
        }

        map.put("fileParam",param);
        map.put("stationInfo",stationInfo);