From a6a45c2fb382a9012984233c061b90020e0fd642 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Apr 2020 14:48:22 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ReportController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 93927f8..4a5b678 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
@@ -92,9 +93,25 @@
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);
+ 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();
- String timeb = parameters.get("timeb").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 = "";
String beginTime = "";
--
Gitblit v1.8.0