Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-20 6688e50ba02988d742baadaca156a303a90b6191

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

@@ -4,10 +4,9 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;



import java.io.OutputStream;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Set;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

@@ -23,9 +22,10 @@


import com.moral.common.bean.ResultBean;

import com.moral.entity.charts.LineChartCriteria;

import com.moral.service.AlarmService;

import com.moral.service.HistoryMinutelyService;



@SuppressWarnings("unchecked")

@SuppressWarnings({ "unchecked", "rawtypes" })

@RestController

@RequestMapping("report")

@CrossOrigin(origins = "*", maxAge = 3600)

@@ -34,11 +34,14 @@
   @Resource

   private HistoryMinutelyService historyMinutelyService;



   @Resource

   private AlarmService alarmService;

	
   @GetMapping("compare")

   public ResultBean<Map<String, List<Object>>> getCompareReport(HttpServletRequest request) throws Exception {

   public ResultBean<Map<String, List>> getCompareReport(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      Map<String, List<Object>> demo = historyMinutelyService.getCompareReport(parameters);

      return new ResultBean<Map<String, List<Object>>>(demo);

      Map<String, List> demo = historyMinutelyService.getCompareReport(parameters);

      return new ResultBean<Map<String, List>>(demo);

   }



   @PostMapping("line-chart")

@@ -68,4 +71,13 @@
      outputStream.close();

      return new ResultBean<Boolean>(true);

   }

	
   @GetMapping("pie")

   public ResultBean<Map<String, Object>> getPieData(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      Map pieData = alarmService.getPieData(parameters);

		
      return new ResultBean<Map<String, Object>>(pieData);

   }



}