From d1f1b489eea7730bb1cb78cdae24c626db835298 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Apr 2020 11:24:16 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ReportController.java | 209 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 184 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index c86ffbb..b01286f 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -1,13 +1,11 @@
package com.moral.controller;
import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -20,6 +18,7 @@
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;
@@ -32,6 +31,9 @@
import com.moral.service.HistoryDailyService;
import com.moral.service.HistoryMinutelyService;
import com.moral.service.MonitorPointService;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelWriter;
import static com.moral.common.util.ExportExcelUtils.exportData;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
@@ -81,6 +83,110 @@
exportColumn[index + 1] = new String[]{name, "10", key};
}
OutputStream outputStream = exportData(response, "Excel������", list, exportColumn);
+ outputStream.flush();
+ outputStream.close();
+ return new ResultBean<Boolean>(true);
+ }
+
+ @GetMapping("newExcel")
+ 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);
+ 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 = "";
+ String beginTime = "";
+ String endTime = "";
+ List<String> monthList1 = new ArrayList<>();
+ monthList1.add("01");
+ monthList1.add("03");
+ monthList1.add("05");
+ monthList1.add("07");
+ monthList1.add("08");
+ monthList1.add("10");
+ monthList1.add("12");
+ List<String> monthList2 = new ArrayList<>();
+ monthList2.add("04");
+ monthList2.add("06");
+ monthList2.add("09");
+ monthList2.add("11");
+ Integer year = Integer.valueOf(endTimes[0]);
+ int i = 0;
+
+ if (type.equals("year")) {
+ dateFormat = "yyyy-MM";
+ beginTime = time + "-01";
+ endTime = timeb + "-12";
+ i = Calendar.MONTH;
+ } else if (type.equals("month")) {
+ dateFormat = "yyyy-MM-dd";
+ beginTime = time + "-01";
+ i = Calendar.DAY_OF_MONTH;
+ if (monthList1.contains(endTimes[1])) {
+ endTime = timeb + "-31";
+ } else if (monthList2.contains(endTimes[1])) {
+ endTime = timeb + "-30";
+ } else {
+ if (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) {
+ endTime = timeb + "-29";
+ } else {
+ endTime = timeb + "-28";
+ }
+ }
+ } else if (type.equals("day")) {
+ dateFormat = "yyyy-MM-dd HH";
+ beginTime = time + " 00";
+ endTime = timeb + " 23";
+ i = Calendar.HOUR_OF_DAY;
+ }
+
+ SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(sdf.parse(beginTime));
+
+ ArrayList<Map<String, Object>> resultList = new ArrayList<>();
+ for (long d = cal.getTimeInMillis(); d <= sdf.parse(endTime).getTime(); cal.set(i, cal.get(i) + 1), d = cal.getTimeInMillis()) {
+ String format = sdf.format(d);
+ Map<String, Object> map = new HashMap<>();
+ map.put("time", format);
+ resultList.add(map);
+ }
+
+ for (Map<String, Object> map : resultList) {
+ for (Map<String, Object> resultMap : list) {
+ if (resultMap.get("time").equals(map.get("time"))) {
+ map.putAll(resultMap);
+ }
+ }
+ }
+
+ List<String> sensors = (List<String>) parameters.get("sensors");//[e1,e2]
+ String[][] exportColumn = new String[sensors.size() + 1][];
+ exportColumn[0] = new String[]{"������", "20", "time"};
+ for (
+ int index = 0; index < sensors.size(); index++) {
+ String[] split = sensors.get(index).split("-");
+ String name = split[1];
+ String key = split[0];
+ String unit = split[2];
+ if (!ObjectUtils.isEmpty(unit) && !"null".equals(unit)) {
+ name += "-" + unit;
+ }
+ exportColumn[index + 1] = new String[]{name, "10", key};
+ }
+
+ OutputStream outputStream = exportData(response, "Excel������", resultList, exportColumn);
outputStream.flush();
outputStream.close();
return new ResultBean<Boolean>(true);
@@ -139,9 +245,26 @@
public ResultBean<Boolean> getCustomMadeExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
ParameterUtils.getTimeType4Time(parameters);
- Object sensorKey = parameters.get("sensorKey");
- String sensorInfo = parameters.get("sensorInfo").toString();
- parameters.put("sensorKeys", Arrays.asList(sensorKey));
+ 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);
List<String> macList = new ArrayList<>();
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
for (MonitorPoint m : monitorPoints) {
@@ -152,27 +275,63 @@
parameters.put("macs", macList);
List<Map<String, Object>> list = new ArrayList<>();
if (!CollectionUtils.isEmpty(macList)) {
- list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
+ list = historyMinutelyService.getDevicesSensorsAvgDataToExcel(parameters);
}
- Map<String, Object> map = list.get(0);
- Map<Integer, String> mapNew = new LinkedHashMap<>();
- int i = 0;
- for (String key : map.keySet()) {
- if (!("monitorPointName".equals(key) || "name".equals(key))) {
- mapNew.put(i, key);
- i++;
+ 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);
}
- String[][] exportColumn = new String[map.size()][];
- exportColumn[0] = new String[]{"������������-" + sensorInfo, "30", "monitorPointName"};
- exportColumn[1] = new String[]{"������������", "20", "name"};
- for (int index = 0; index < map.size() - 2; index++) {
- exportColumn[index + 2] = new String[]{mapNew.get(index), "20", mapNew.get(index)};
+ if (!CollectionUtils.isEmpty(sheets)) {
+ ExcelWriter writer = new ExcelWriter(false, sensorKeysNames.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.write(sheets.get(i), true);
+ writer.autoSizeColumnAll();
+ writer.setColumnWidth(0, 25);
+ writer.setColumnWidth(1, 25);
+ }
+ }
+ response.setContentType("application/vnd.ms-excel;charset=utf-8");
+ String codedFileName = java.net.URLEncoder.encode("Excel������", "UTF-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + codedFileName + ".xls");
+ ServletOutputStream out = response.getOutputStream();
+ writer.flush(out, true);
+ // ������writer���������������
+ writer.close();
+ //������������������������Servlet���
+ IoUtil.close(out);
}
- OutputStream outputStream = exportData(response, "Excel������", list, exportColumn);
- outputStream.flush();
- outputStream.close();
- return new ResultBean<Boolean>(true);
+ return new ResultBean<>(true);
}
}
--
Gitblit v1.8.0