From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ReportController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index ed398a7..1d247bb 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -4,10 +4,9 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;
import java.io.OutputStream;
-import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -23,9 +22,10 @@
import com.moral.common.bean.ResultBean;
import com.moral.entity.charts.LineChartCriteria;
+import com.moral.service.AlarmService;
import com.moral.service.HistoryMinutelyService;
-@SuppressWarnings("unchecked")
+@SuppressWarnings({ "unchecked", "rawtypes" })
@RestController
@RequestMapping("report")
@CrossOrigin(origins = "*", maxAge = 3600)
@@ -34,11 +34,14 @@
@Resource
private HistoryMinutelyService historyMinutelyService;
+ @Resource
+ private AlarmService alarmService;
+
@GetMapping("compare")
- public ResultBean<Map<String, List<Object>>> getCompareReport(HttpServletRequest request) throws Exception {
+ public ResultBean<Map<String, List>> getCompareReport(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map<String, List<Object>> demo = historyMinutelyService.getCompareReport(parameters);
- return new ResultBean<Map<String, List<Object>>>(demo);
+ Map<String, List> demo = historyMinutelyService.getCompareReport(parameters);
+ return new ResultBean<Map<String, List>>(demo);
}
@PostMapping("line-chart")
@@ -50,7 +53,7 @@
public ResultBean<Boolean> getExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
- List<String> sensors= (List<String>) parameters.get("sensors");
+ List<String> sensors = (List<String>) parameters.get("sensors");
String[][] exportColumn = new String[sensors.size() + 1][];
exportColumn[0] = new String[] { "������", "20", "time" };
for (int index = 0; index < sensors.size(); index++) {
@@ -58,14 +61,23 @@
String name = split[1];
String key = split[0];
String unit = split[2];
- if (!ObjectUtils.isEmpty(unit) && !"null".equals(unit) ) {
+ if (!ObjectUtils.isEmpty(unit) && !"null".equals(unit)) {
name += "-" + unit;
- }
- exportColumn[index + 1] = new String[] { name , "10", key };
+ }
+ 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("pie")
+ public ResultBean<Map<String, Object>> getPieData(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ Map pieData = alarmService.getPieData(parameters);
+
+ return new ResultBean<Map<String, Object>>(pieData);
+ }
+
}
--
Gitblit v1.8.0