From 4428fd50d5e8216d5d7bd63a7fc2e1bb8e239d9d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 13 May 2020 13:58:13 +0800
Subject: [PATCH] update大屏地图跳转定位问题
---
src/main/java/com/moral/controller/ReportController.java | 208 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 185 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index c86ffbb..d3c7e6c 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -1,17 +1,22 @@
package com.moral.controller;
import java.io.OutputStream;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
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;
@@ -32,6 +37,10 @@
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;
import static com.moral.common.util.ExportExcelUtils.exportData;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
@@ -50,6 +59,9 @@
@Resource
private MonitorPointService monitorPointService;
+
+ @Resource
+ private SensorService sensorService;
@GetMapping("compare")
public ResultBean<Map<String, List>> getCompareReport(HttpServletRequest request) throws Exception {
@@ -81,6 +93,146 @@
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);
+ String type = parameters.get("type").toString();
+ String time = parameters.get("time").toString();
+ String timeb;
+ if (parameters.get("timeb") == null) {
+ timeb = time;
+ }else {
+ timeb=parameters.get("timeb").toString();
+ }
+
+ String[] endTimes = timeb.split("-");
+ String dateFormat = "";
+ String beginTime = "";
+ String endTime = "";
+ List<String> monthList1 = new ArrayList<>();
+ Collections.addAll(monthList1,"01","03","05","07","08","10","12");
+ List<String> monthList2 = new ArrayList<>();
+ Collections.addAll(monthList2,"04","06","09","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;
+ }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);
+ 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);
+ }
+
+ if(type.equals("year")){
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy");
+ Date dt = sd.parse(timeb);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dt);
+ calendar.add(Calendar.YEAR, 1);
+ Date dt1 = calendar.getTime();
+ timeb = sd.format(dt1);
+ }else if(type.equals("month")){
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM");
+ Date dt = sd.parse(timeb);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dt);
+ calendar.add(Calendar.MONTH, 1);
+ Date dt1 = calendar.getTime();
+ timeb = sd.format(dt1);
+ }else if(type.equals("day")){
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+ Date dt = sd.parse(timeb);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dt);
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ Date dt1 = calendar.getTime();
+ timeb = sd.format(dt1);
+ }else if(type.equals("hour")){
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH");
+ Date dt = sd.parse(timeb);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dt);
+ calendar.add(Calendar.HOUR_OF_DAY, 1);
+ Date dt1 = calendar.getTime();
+ timeb = sd.format(dt1);
+ }
+ parameters.put("timeb",timeb);
+ 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,"");
+ }
+ }
+ }
+
+ 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 +291,11 @@
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 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) {
@@ -152,27 +306,35 @@
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 = sensorService.listExcelDatas(sensorInfos, list);
+ if (!CollectionUtils.isEmpty(sheets)) {
+ 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(sensorInfos.get(1).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);
}
- 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)};
- }
- OutputStream outputStream = exportData(response, "Excel������", list, exportColumn);
- outputStream.flush();
- outputStream.close();
- return new ResultBean<Boolean>(true);
+ return new ResultBean<>(true);
}
}
--
Gitblit v1.8.0