From 2bad8336e2c14ffd85403c14ad254916146b6a5e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 15:11:31 +0800
Subject: [PATCH] 报表模块
---
src/main/java/com/moral/controller/ReportController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 1726d19..f2058a8 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -12,10 +12,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSON;
+import com.moral.entity.charts.LineChartCriteria;
+import com.moral.entity.charts.PairData;
+import org.springframework.web.bind.annotation.*;
import com.moral.common.bean.ResultBean;
import com.moral.service.HistoryMinutelyService;
@@ -34,17 +34,19 @@
Map<String, List<Object>> demo = historyMinutelyService.getCompareReport(parameters);
return new ResultBean<Map<String,List<Object>>>(demo);
}
-
+ @PostMapping("line-chart")
+ public ResultBean <List<List<PairData>>> lineChart(@RequestBody LineChartCriteria lineChartCriteria){
+ return new ResultBean<>(historyMinutelyService.queryLineChartDateByCrieria(lineChartCriteria));
+ }
@GetMapping("excel")
public ResultBean<Boolean> getExcelReport(HttpServletRequest request,HttpServletResponse response) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData4Excel(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
String[][] exportColumn = new String[2][];
- exportColumn[0] = new String[] { "������", "20", "time" };
if (parameters.containsKey("sensors")) {
Set<String> sensors = (Set<String>) parameters.get("sensors");
exportColumn = new String[sensors.size() + 1][];
- exportColumn[0] = new String[] { "������", "20", "time" };
+ // exportColumn[0] = new String[] { "������", "20", "time" };
int index = 1;
for (String sensorKey : sensors) {
String[] split = sensorKey.split("-");
@@ -56,6 +58,7 @@
} else {
exportColumn[1] = new String[] { (String) parameters.get("sensorName"), "10", (String) parameters.get("sensorKey") };
}
+ exportColumn[0] = new String[] { "������", "20", "time" };
OutputStream outputStream = exportData(response, "Excel������", list, exportColumn);
outputStream.flush();
--
Gitblit v1.8.0