From 32a9814316c4292750a8e432e8a7e04ae2bef1c9 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 17 Apr 2020 14:53:20 +0800
Subject: [PATCH] update报表接口
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index e9edf52..0333593 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/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);
}
--
Gitblit v1.8.0