From 2c90ca6754397903904ca8efabb4c9c93889b970 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Feb 2018 14:01:31 +0800
Subject: [PATCH] 报表 相关
---
src/main/java/com/moral/controller/ReportController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index a226e52..1726d19 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -18,7 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.moral.common.bean.ResultBean;
-import com.moral.service.DataService;
+import com.moral.service.HistoryMinutelyService;
@RestController
@RequestMapping("report")
@@ -26,19 +26,19 @@
public class ReportController {
@Resource
- private DataService dataService;
+ private HistoryMinutelyService historyMinutelyService;
@GetMapping("compare")
public ResultBean<Map<String, List<Object>>> getCompareReport(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map<String, List<Object>> demo = dataService.getCompareReport(parameters);
+ Map<String, List<Object>> demo = historyMinutelyService.getCompareReport(parameters);
return new ResultBean<Map<String,List<Object>>>(demo);
}
@GetMapping("excel")
public ResultBean<Boolean> getExcelReport(HttpServletRequest request,HttpServletResponse response) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- List<Map<String, Object>> list = dataService.getMonitorPointOrDeviceAvgData4Excel(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData4Excel(parameters);
String[][] exportColumn = new String[2][];
exportColumn[0] = new String[] { "������", "20", "time" };
if (parameters.containsKey("sensors")) {
--
Gitblit v1.8.0