From 5b5c54680381fd08fa5e50ac5c8fb841243a7c99 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Thu, 15 Mar 2018 14:58:04 +0800 Subject: [PATCH] 地图相关资源 --- src/main/java/com/moral/controller/ReportController.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java index 72bfd3a..f2058a8 100644 --- a/src/main/java/com/moral/controller/ReportController.java +++ b/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 <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); -- Gitblit v1.8.0