From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ReportController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 39b6a6a..b95ea24 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -82,9 +82,17 @@
@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);
+ List<Integer> result = alarmDailyService.getAlarmDataByYear(parameters);
- return new ResultBean<List<Integer>>(alarmDataByYear);
+ return new ResultBean<List<Integer>>(result);
+ }
+
+ @GetMapping("alarm-month")
+ public ResultBean<List<Map<String, Object>>> getAlarmDataByMonth(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Map<String, Object>> result = alarmDailyService.getAlarmDataByMonth(parameters);
+
+ return new ResultBean<List<Map<String, Object>>>(result);
}
}
--
Gitblit v1.8.0