fix:数据调整

cjl

2023-09-04 1a8d8d019e5ddc8101f8d9556bbb9fce4b96d861

fix:数据调整

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

@@ -56,22 +56,21 @@

    @GetMapping("resultWord")
    public void adresultWordd(HttpServletResponse response,String time,String endTime) {
        String ks = "2023-06-22";
        endTime = "2023-08-06";
        Date ksDate = DateUtils.convertDate(ks);
        List<SysTest> listAll = sysTestService.listAll(ks,endTime,null);
        if(CollectionUtils.isEmpty(listAll)){
            return;
        }
        for(SysTest s : listAll){
            Date endTimes =s.getTime();
            String endTimeStr = DateUtils.dateToDateString(endTimes,DateUtils.yyyyMMdd_EN);
        String ks = "2023-08-06";
        for(int i =1;i<2;i++){
            Date ksDate = DateUtils.convertDate(ks);
            List<SysTest> listAll = sysTestService.listAll(ks,null,null);
            if(CollectionUtils.isEmpty(listAll)){
                return;
            }
            String endTimeStr = DateUtils.dateToDateString(ksDate,DateUtils.yyyyMMdd_EN);
            String  fileName = "空气质量日报.docx";
            Map<String,Object> map = resultMap(listAll);
            downloadWord(fileName, map, response,"空气质量日报"+endTimeStr+".docx");
            //time = DateUtils.dateToDateString(DateUtils.addDays(endTime,1),DateUtils.yyyy_MM_dd_EN);
            ks = DateUtils.dateToDateString(DateUtils.addDays(ksDate,1),DateUtils.yyyy_MM_dd_EN);
        }
    }


    @GetMapping("excelM")
    public void excelM(HttpServletResponse response,String time,String endTime) {
@@ -117,9 +116,10 @@

    @GetMapping("resultWordWeek")
    public void resultWordWeek(HttpServletResponse response) {
        String ks = "2020-06-22";
        String ks = "2023-06-19";
        Date ksDate = DateUtils.convertDate(ks);
        for(int i = 0;i<157;i++){
        int num = 157;
        for(int i = 0;i<8;i++){
            Date jsDate =  DateUtils.addDays(ksDate,6);
            String time = DateUtils.dateToDateString(ksDate,DateUtils.yyyy_MM_dd_EN);
            String endTime = DateUtils.dateToDateString(jsDate,DateUtils.yyyy_MM_dd_EN);
@@ -130,9 +130,10 @@
            String  fileName = "空气质量周报.docx";
            String time1 = DateUtils.dateToDateString(ksDate,"yyyy.MM.dd");
            String endTime1= DateUtils.dateToDateString(jsDate,"yyyy.MM.dd");
            Map<String,Object> map = resultWeekMap(listAll,i+1,time1+"-"+endTime1);
            Map<String,Object> map = resultWeekMap(listAll,num,time1+"-"+endTime1);
            downloadWord(fileName, map, response,"空气质量周报"+time+".docx");
            ksDate =  DateUtils.addDays(ksDate,7);
            num++;
        }
    }

@@ -164,7 +165,7 @@
        String path = getPath(fileName);//我这放 resources包下
        try {
            //获取模板文档
            OutputStream out = new FileOutputStream("E:\\home\\mon1\\" + newFileName);
            OutputStream out = new FileOutputStream("E:\\home\\week1\\" + newFileName);
            File rootFile = new File(ResourceUtils.getURL("classpath:").getPath());
            File file= new File(rootFile, path);
            XWPFDocument word = WordExportUtil.exportWord07(file.getPath(), params);
@@ -274,13 +275,13 @@
            resultMap.put(name+"TV", StringUtils.isNotEmpty(s.getVoc())?s.getVoc():"--");
            resultMap.put(name+"S", StringUtils.isNotEmpty(s.getSu())?s.getSu():"--");
        }
       // String bodyName = stringButterStrWeek(listAll);
        HashMap<String, Integer> datas = new HashMap<>(3);
        String bodyName = stringButterStrWeek(listAll);
       /* HashMap<String, Integer> datas = new HashMap<>(3);
        datas.put("一号",10);
        datas.put("二号",20);
        datas.put("三号",40);
        ImageEntity imageEntity = pieChart("测试",datas, 500, 300);
        resultMap.put("主要内容",imageEntity);
        ImageEntity imageEntity = pieChart("测试",datas, 500, 300);*/
        resultMap.put("主要内容",bodyName);
        return resultMap;
    }
    private Map<String,Object> resultWeekMap(List<SysTest> listAll,String weekTime,List<SysTest> listDay,int days){
@@ -796,15 +797,23 @@
    }

    public static void main(String[] args) {
        String ks = "2020-06-01";
        /*String ks = "2020-06-01";
        Date ksDate = DateUtils.convertDate(ks);
        for(int i = 0;i<37;i++){
            Date jsDate =  DateUtils.getLastDayOfCurrMonth(ksDate);
            System.out.println("开始："+DateUtils.dateToDateString(ksDate,DateUtils.yyyy_MM_dd_EN));
            System.out.println("结束："+DateUtils.dateToDateString(jsDate,DateUtils.yyyy_MM_dd_EN));
            ksDate =  DateUtils.addMonths(ksDate,1);
        }
        }*/

        String ks = "2023-06-22";
        for(int i =1;i<46;i++){
            Date ksDate = DateUtils.convertDate(ks);
            System.out.println("开始："+DateUtils.dateToDateString(ksDate,DateUtils.yyyy_MM_dd_EN));

            ks = DateUtils.dateToDateString(DateUtils.addDays(ksDate,1),DateUtils.yyyy_MM_dd_EN);
            System.out.println("结束："+ks);
        }

        /*String ks = "2020-06-22";
        Date ksDate = DateUtils.convertDate(ks);