fix：日报数据调整

cjl

2024-04-18 f72da3bc5ca43fd37c1f0de15a1e9128a627a563

 screen-api/src/main/java/com/moral/api/controller/YcReptilesController.java

@@ -86,6 +86,7 @@
    }



    @PostMapping("/page")
    @ApiOperation("分页")
    public ResultMessage<PageResult<YcGenerateReportPageVo>> page(@Valid @RequestBody YcGenerateReportPageCond ycGenerateReportPageCond) {
@@ -132,7 +133,7 @@
        Map<String,Object> map0 = resultService.getYcDaily(url,cookie,DateUtils.dateToDateString(DateUtils.getFirstDayOfLastYear(endDate),DateUtils.yyyy_MM_dd_EN),2);


        Date dateTime = DateUtils.getFirstDayOfMonth(resultDate);
        Date dateTime = DateUtils.getFirstDayOfMonth(endDate);

        String sTime = DateUtils.dateToDateString(dateTime);
        String eTime = endDateTime+" 00:00:00";
@@ -172,7 +173,7 @@
        // 结果文件，省去了根据模板文件生成的步骤
       // String resultFile = "E:/java/模板-盐城县市区统计1.xlsx";

        String templateFile = basePath+"/模板-盐城县市区统计001.xlsx";
        String templateFile = basePath+"/001.xlsx";
        String resultFileName = endDateTime+"盐城县市区统计.xlsx";;
        String resultFile =UUID.randomUUID().toString()+".xlsx";;
        storageFile(filePath.concat(resultFile));
@@ -202,6 +203,14 @@
       // map.put("dd", list);

        List<AqiResultVo>  list = (List<AqiResultVo>) map.get("table");
        list.forEach(it->{
                if(it.getName().equals("盐都区(市)")){
                    it.setName("盐都区");
                }
            if(it.getName().equals("大丰高级中学(国)")){
                it.setName("大丰高级中学");
            }
        });
        List<AqiResultVo>  listG = list.stream().filter(it->yc.contains(it.getName())).collect(Collectors.toList());
        List<AqiResultVo>  listG1 = list.stream().filter(it->!yc.contains(it.getName())&&!it.getName().equals("总计")).collect(Collectors.toList());

@@ -272,7 +281,7 @@
        //String templateFile1 = "E:/java/模板-日报模板计算00.xlsx";
        // 结果文件，省去了根据模板文件生成的步骤
        //String resultFile1 = "E:/java/模板-日报模板计算1.xlsx";
        String templateFile1 = basePath+"/模板-日报模板计算00.xlsx";
        String templateFile1 = basePath+"/00.xlsx";
        String resultFileName1 = endDateTime+"日报统计.xlsx";
        String resultFile1 = UUID.randomUUID().toString()+".xlsx";;
        storageFile(filePath.concat(resultFile1));
@@ -289,8 +298,17 @@
        map.put("title1",map0.get("title"));
        excelWriter1.fill(map, writeSheet4);
        List<AqiResultVo>  list0 = (List<AqiResultVo>) map0.get("table");
        list0.forEach(it->{
            if(it.getName().equals("盐都区(市)")){
                it.setName("盐都区");
            }
            if(it.getName().equals("大丰高级中学(国)")){
                it.setName("大丰高级中学");
            }
        });
        List<AqiResultVo>  list00 = list0.stream().filter(it->!yc.contains(it.getName())&&!it.getName().equals("总计")).collect(Collectors.toList());
        excelWriter1.fill(new FillWrapper("data",listG1),fillConfig, writeSheet4);
        excelWriter1.fill(new FillWrapper("data0",list0),fillConfig, writeSheet4);
        excelWriter1.fill(new FillWrapper("data0",list00),fillConfig, writeSheet4);
        //map1.put("title1",map2.get("title"));
        excelWriter1.fill(map1, writeSheet5);
        excelWriter1.fill(new FillWrapper("data1",list1G1),fillConfig, writeSheet5);
@@ -332,14 +350,14 @@
                Yc.get(0).getGranule25()+"微克/立方米、O3浓度为"+Yc.get(0).getOO()+"微克/立方米、优良率为").
                append(Yc.get(0).getCategory().equals("良")||Yc.get(0).getCategory().equals("优")?"100%；":"0%；").append("\n");
        broadcast.append(timeMon+"，盐城市PM2.5浓度均值为"+ycMon.getPM25()+"微克/立方米，同比"+testController.compareYear(ycMon.getPM25(),ycMonOld.getPM25(),2)+"；O3浓度均值为");
        broadcast.append(ycMon.getOOAvg()+"微克/立方米，同比"+testController.compareYear(ycMon.getOOAvg(),ycMonOld.getOOAvg(),2)+"。优良率为"+ycYMon.getExcellentRateRatio()+"%，同比"+testController.compareYear(ycYMon.getExcellentRateRatio(),ycYMonOld.getExcellentRateRatio(),1)+"。").append("\n");
        broadcast.append((int)ycMon.getOOAvg()+"微克/立方米，同比"+testController.compareYear(ycMon.getOOAvg(),ycMonOld.getOOAvg(),2)+"。优良率为"+ycYMon.getExcellentRateRatio()+"%，同比"+testController.compareYear(ycYMon.getExcellentRateRatio(),ycYMonOld.getExcellentRateRatio(),1)+"。").append("\n");
        broadcast.append("截至"+timeDay+",盐城市PM2.5浓度均值为"+ycYear.getPM25()+"微克/立方米，同比"+testController.compareYear(ycYear.getPM25(),ycYearOld.getPM25(),2)+"。O3浓度均值为");
        broadcast.append(ycYear.getOOAvg()+"微克/立方米，同比"+testController.compareYear(ycYear.getOOAvg(),ycYearOld.getOOAvg(),2)+"。优良率为"+ycYYear.getExcellentRateRatio()+"%，同比"+testController.compareYear(ycYYear.getExcellentRateRatio(),ycYYearOld.getExcellentRateRatio(),1)+"。").append("\n");
        broadcast.append((int)ycYear.getOOAvg()+"微克/立方米，同比"+testController.compareYear(ycYear.getOOAvg(),ycYearOld.getOOAvg(),2)+"。优良率为"+ycYYear.getExcellentRateRatio()+"%，同比"+testController.compareYear(ycYYear.getExcellentRateRatio(),ycYYearOld.getExcellentRateRatio(),1)+"。").append("\n");
        broadcast.append("\n");

        broadcast.append("【盐城市空气质量达标情况分析】").append("\n");
        broadcast.append("截至"+timeDay+"，盐城市 PM2.5累积均值为"+ycYear.getPM25()+"微克/立方米（去年同期"+ycYearOld.getPM25()+"微克/立方米），同比"+testController.compareYear(ycYear.getPM25(),ycYearOld.getPM25(),2)+"，若要PM2.5年均浓度达到目标值27.0微克/立方米，剩余");
        broadcast.append(testController.annualTarget(ycYear.getPM25(),27.0,resultDate)+"优良天数比率为"+ycYYear.getExcellentRateRatio()+"（去年同期"+ycYYearOld.getExcellentRateRatio()+"），同比"+testController.compareYear(ycYYear.getExcellentRateRatio(),ycYYearOld.getExcellentRateRatio(),1)+"；当前已超标"+surplusDay+"天，超标天数已超过同期污染天数"+(surplusDay-surplusOldDay)+"天。").append("\n");
        broadcast.append(testController.annualTarget(ycYear.getPM25(),27.0,resultDate)+"优良天数比率为"+ycYYear.getExcellentRateRatio()+"%（去年同期"+ycYYearOld.getExcellentRateRatio()+"%），同比"+testController.compareYear(ycYYear.getExcellentRateRatio(),ycYYearOld.getExcellentRateRatio(),1)+"；当前已超标"+surplusDay+"天，超标天数已超过同期污染天数"+(surplusDay-surplusOldDay)+"天。").append("\n");
        broadcast.append("\n");

        broadcast.append("【国控站点空气质量情况】").append("\n");
@@ -423,7 +441,7 @@
            fileTable.setCreateId(user.getUserId()).setCreateName(user.getUserName()).setCreateTime(new Date());
        }
        fileTableService.save(fileTable);
        fileTable.setFileName(resultFileName1).setFileAddress(path.concat(resultFile));
        fileTable.setFileName(resultFileName1).setFileAddress(path.concat(resultFile1));
        fileTableService.save(fileTable);

    }
@@ -578,7 +596,7 @@
            }else if(2 == type){
                result = concentrationsVo.getYoYPM25Str();
            }else if(3 == type){
                result = Double.toString(concentrationsVo.getOOAvg());
                result = String.valueOf((int)(concentrationsVo.getOOAvg()));
            }else if(4 == type){
                result = concentrationsVo.getYoYO3Str();
            }else if(5 == type){
@@ -655,7 +673,7 @@
                if(6 == type){
                    topThreeNum.append("。");
                }else {
                    topThreeNum.append(";");
                    topThreeNum.append("；");
                }

            }