From 28e9535f217b2965515ffb959bacc23234d17aca Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 06 Aug 2019 15:26:35 +0800
Subject: [PATCH] 重合点改为聚合图片，调整重合数量显示位置
---
src/main/java/com/moral/controller/ReportController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index b95ea24..d191744 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -20,8 +20,12 @@
import org.springframework.web.bind.annotation.RestController;
import com.moral.common.bean.ResultBean;
+import com.moral.common.util.WebUtils;
import com.moral.entity.charts.LineChartCriteria;
+import com.moral.security.auth.JwtAuthenticationToken;
+import com.moral.security.model.UserContext;
import com.moral.service.AlarmDailyService;
+import com.moral.service.HistoryDailyService;
import com.moral.service.HistoryMinutelyService;
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -95,4 +99,28 @@
return new ResultBean<List<Map<String, Object>>>(result);
}
+ @Resource
+ private HistoryDailyService historyDailyService;
+
+ @GetMapping("emissions")
+ public ResultBean<List<Map<String, Object>>> getemissionsData(HttpServletRequest request, JwtAuthenticationToken token) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ UserContext userContext = token.getPrincipal();
+ Integer orgId = userContext.getOrganizationId();
+ parameters.put("orgId", orgId);
+ List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);
+ return new ResultBean<List<Map<String, Object>>>(result);
+ }
+
+
+ @GetMapping("overproof")
+ public ResultBean<Map> getOverproofData(HttpServletRequest request, JwtAuthenticationToken token) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ UserContext userContext = token.getPrincipal();
+ Integer orgId = userContext.getOrganizationId();
+ parameters.put("orgId", orgId);
+ //List<Map<String, Object>> result = null;
+ Map result = historyDailyService.getOverproofData(parameters);
+ return new ResultBean<Map>(result);
+ }
}
--
Gitblit v1.8.0