From 6d25e424b3464f55fb62112ddb6bd5d84df5cc2f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 30 Apr 2020 16:57:27 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ReportController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index b01286f..8e0f4ef 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -2,7 +2,12 @@
import java.io.OutputStream;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
@@ -92,17 +97,23 @@
public ResultBean<Boolean> getNExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
- System.out.println(list);
+ ArrayList<String> sensorKeys = (ArrayList<String>)parameters.get("sensorKeys");
+ for (Map<String, Object> map : list) {
+ for (String sensorKey : sensorKeys) {
+ if(map.get(sensorKey)==null){
+ map.put(sensorKey,"");
+ }
+ }
+ }
+
String type = parameters.get("type").toString();
String time = parameters.get("time").toString();
- System.out.println(parameters);
String timeb = "";
if (parameters.get("timeb") == null) {
timeb = parameters.get("time").toString();
} else {
timeb = parameters.get("timeb").toString();
}
-
String[] endTimes = timeb.split("-");
String dateFormat = "";
--
Gitblit v1.8.0