ZhuDongming
2020-04-17 32a9814316c4292750a8e432e8a7e04ae2bef1c9
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -620,14 +620,25 @@
            LocalDateTime end = value.with(TemporalAdjusters.lastDayOfMonth());
            parameters.put("start", start);
            parameters.put("end", end);
            int day=end.getDayOfMonth();
            List<String> timeList=new ArrayList<>();
            for(int i=0;i<=day-1;i++){
                timeList.add(start.plusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
            }
            parameters.put("timeList", timeList);
        }else if("day".equals(parameters.get("type"))){
            String time = parameters.get("time")+"T00:00:00";
            LocalDateTime value = LocalDateTime.parse(time);
            LocalDateTime end=value.plusHours(23);
            parameters.put("timeUnits", "hourly");
            parameters.put("typeFormat", "%Y-%m-%d %H");
            parameters.put("typeFormat", "%Y-%m-%d %H:%i");
            parameters.put("start", time);
            parameters.put("end", end);
            List<String> timeList=new ArrayList<>();
            for(int i=0;i<=23;i++){
                timeList.add(value.plusHours(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
            }
            parameters.put("timeList", timeList);
        }
        return historyMinutelyMapper.getDevicesAvgDataToExcel(parameters);
    }