From 7234d03b3c51794c99c6bee8a617f9927898bd3f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 04 May 2018 16:33:43 +0800
Subject: [PATCH] 运维app
---
src/main/java/com/moral/controller/ReportController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 1d247bb..39b6a6a 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -4,7 +4,6 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;
import java.io.OutputStream;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -22,7 +21,7 @@
import com.moral.common.bean.ResultBean;
import com.moral.entity.charts.LineChartCriteria;
-import com.moral.service.AlarmService;
+import com.moral.service.AlarmDailyService;
import com.moral.service.HistoryMinutelyService;
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -35,7 +34,7 @@
private HistoryMinutelyService historyMinutelyService;
@Resource
- private AlarmService alarmService;
+ private AlarmDailyService alarmDailyService;
@GetMapping("compare")
public ResultBean<Map<String, List>> getCompareReport(HttpServletRequest request) throws Exception {
@@ -75,9 +74,17 @@
@GetMapping("pie")
public ResultBean<Map<String, Object>> getPieData(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- Map pieData = alarmService.getPieData(parameters);
+ Map pieData = alarmDailyService.getPieData(parameters);
return new ResultBean<Map<String, Object>>(pieData);
}
+ @GetMapping("alarm-year")
+ public ResultBean<List<Integer>> getAlarmDataByYear(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Integer> alarmDataByYear = alarmDailyService.getAlarmDataByYear(parameters);
+
+ return new ResultBean<List<Integer>>(alarmDataByYear);
+ }
+
}
--
Gitblit v1.8.0