增加 年查询

xufenglei

2018-08-07 e66b0932eb782c6ec771ffaa9957e6d5d5361286

 src/main/java/com/moral/controller/ReportController.java

@@ -21,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" })

@@ -34,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 {

@@ -74,9 +74,25 @@
   @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> result = alarmDailyService.getAlarmDataByYear(parameters);

		
      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);

   }



}