报表 优化

xufenglei

2018-03-26 8546724bd6847fd5ac0db6d451e74a31ca2d5532

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

@@ -12,10 +12,10 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import org.springframework.web.bind.annotation.CrossOrigin;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.alibaba.fastjson.JSON;

import com.moral.entity.charts.LineChartCriteria;

import com.moral.entity.charts.PairData;

import org.springframework.web.bind.annotation.*;



import com.moral.common.bean.ResultBean;

import com.moral.service.HistoryMinutelyService;

@@ -34,7 +34,10 @@
      Map<String, List<Object>> demo = historyMinutelyService.getCompareReport(parameters); 

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

   }



   @PostMapping("line-chart")

   public ResultBean <Map<String, List<List<PairData>>>> lineChart(@RequestBody LineChartCriteria lineChartCriteria){

      return  new ResultBean<>(historyMinutelyService.queryLineChartDateByCrieria(lineChartCriteria));

   }

   @GetMapping("excel")

   public ResultBean<Boolean> getExcelReport(HttpServletRequest request,HttpServletResponse response) throws Exception {

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