From 59ea47acd477c8681cd1a2a59be53e69eab9fba0 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 07 May 2020 08:58:02 +0800
Subject: [PATCH] update导出报表
---
src/main/java/com/moral/controller/ReportController.java | 86 +++++++++++++++---------------------------
1 files changed, 31 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index b01286f..5d90395 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -2,7 +2,11 @@
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.List;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
@@ -10,6 +14,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;
@@ -18,7 +23,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ParameterUtils;
import com.moral.common.util.WebUtils;
@@ -31,6 +35,7 @@
import com.moral.service.HistoryDailyService;
import com.moral.service.HistoryMinutelyService;
import com.moral.service.MonitorPointService;
+import com.moral.service.SensorService;
import cn.hutool.core.io.IoUtil;
import cn.hutool.poi.excel.ExcelWriter;
@@ -52,6 +57,9 @@
@Resource
private MonitorPointService monitorPointService;
+
+ @Resource
+ private SensorService sensorService;
@GetMapping("compare")
public ResultBean<Map<String, List>> getCompareReport(HttpServletRequest request) throws Exception {
@@ -92,17 +100,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 = "";
@@ -149,6 +163,11 @@
beginTime = time + " 00";
endTime = timeb + " 23";
i = Calendar.HOUR_OF_DAY;
+ } else if (type.equals("hour")) {
+ dateFormat = "yyyy-MM-dd HH:mm";
+ beginTime = time + ":00:00";
+ endTime = timeb + ":59:00";
+ i = Calendar.MINUTE;
}
SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
@@ -246,25 +265,10 @@
Map<String, Object> parameters = getParametersStartingWith(request, null);
ParameterUtils.getTimeType4Time(parameters);
String sensorsInfo = parameters.get("sensors").toString();
- String[] sensorsStr = sensorsInfo.split(",");
- List<String> sensorKeys = new ArrayList<>();
- List<String> sensorKeysNames = new ArrayList<>();
- List<String> sensorKeysUnits = new ArrayList<>();
- for (int index = 0; index < sensorsStr.length; index++) {
- String[] split = sensorsStr[index].split("-");
- String key;
- if (index == 0) {
- key = split[0].replace("\"", "").substring(1);
- } else {
- key = split[0].replace("\"", "");
- }
- String name = split[1].replace("\"", "");
- String Unit = split[2].replace("\"", "");
- sensorKeys.add(key);
- sensorKeysNames.add(name);
- sensorKeysUnits.add(Unit);
- }
- parameters.put("sensorKeys", sensorKeys);
+ String sensorsInfoNew = StringUtils.strip(sensorsInfo, "[]");
+ String[] sensorsStr = sensorsInfoNew.split(",");
+ List<List<String>> sensorInfos = sensorService.listSensorInfos(sensorsStr);
+ parameters.put("sensorKeys", sensorInfos.get(0));
List<String> macList = new ArrayList<>();
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
for (MonitorPoint m : monitorPoints) {
@@ -277,44 +281,16 @@
if (!CollectionUtils.isEmpty(macList)) {
list = historyMinutelyService.getDevicesSensorsAvgDataToExcel(parameters);
}
- List<List<Map<String, Object>>> sheets = new ArrayList<>();
- for (int i = 0; i < sensorKeys.size(); i++) {
- List<Map<String, Object>> sheet = new ArrayList<>();
- for (int j = 0; j < list.size(); j++) {
- Map<String, Object> data = new LinkedHashMap<>();
- for (Map.Entry<String, Object> kv : list.get(j).entrySet()) {
- if ("monitorPointName".equals(kv.getKey())) {
- data.put("������������(������:" + sensorKeysUnits.get(i) + ")", kv.getValue());
- } else if ("name".equals(kv.getKey())) {
- data.put("������������", kv.getValue());
- } else {
- String sensorsValue = kv.getValue().toString();
- JSONObject jsonObject = JSONObject.parseObject(sensorsValue);
- if (jsonObject != null) {
- List<Object> sensorsValueList = (List<Object>) jsonObject.get(sensorKeys.get(i));
- if (sensorsValueList != null) {
- data.put(kv.getKey(), sensorsValueList.get(0));
- } else {
- data.put(kv.getKey(), "");
- }
- } else {
- data.put(kv.getKey(), "");
- }
- }
- }
- sheet.add(data);
- }
- sheets.add(sheet);
- }
+ List<List<Map<String, Object>>> sheets = sensorService.listExcelDatas(sensorInfos, list);
if (!CollectionUtils.isEmpty(sheets)) {
- ExcelWriter writer = new ExcelWriter(false, sensorKeysNames.get(0));
+ ExcelWriter writer = new ExcelWriter(false, sensorInfos.get(1).get(0));
writer.write(sheets.get(0), true);
writer.autoSizeColumnAll();
writer.setColumnWidth(0, 25);
writer.setColumnWidth(1, 25);
if (sheets.size() >= 2) {
for (int i = 1; i < sheets.size(); i++) {
- writer.setSheet(sensorKeysNames.get(i));
+ writer.setSheet(sensorInfos.get(1).get(i));
writer.write(sheets.get(i), true);
writer.autoSizeColumnAll();
writer.setColumnWidth(0, 25);
--
Gitblit v1.8.0