From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/controller/ReportController.java |   75 ++++++++++++++++++++++++++++++++-----
 1 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index ed398a7..d191744 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -4,10 +4,8 @@
 import static com.moral.common.util.WebUtils.getParametersStartingWith;
 
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -22,10 +20,15 @@
 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")
+@SuppressWarnings({ "unchecked", "rawtypes" })
 @RestController
 @RequestMapping("report")
 @CrossOrigin(origins = "*", maxAge = 3600)
@@ -34,11 +37,14 @@
 	@Resource
 	private HistoryMinutelyService historyMinutelyService;
 
+	@Resource
+	private AlarmDailyService alarmDailyService;
+	
 	@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")
@@ -50,7 +56,7 @@
 	public ResultBean<Boolean> getExcelReport(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
 		List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
-		List<String> sensors= (List<String>) parameters.get("sensors");
+		List<String> sensors = (List<String>) parameters.get("sensors");
 		String[][] exportColumn = new String[sensors.size() + 1][];
 		exportColumn[0] = new String[] { "������", "20", "time" };
 		for (int index = 0; index < sensors.size(); index++) {
@@ -58,14 +64,63 @@
 			String name = split[1];
 			String key = split[0];
 			String unit = split[2];
-			if (!ObjectUtils.isEmpty(unit) && !"null".equals(unit) ) {
+			if (!ObjectUtils.isEmpty(unit) && !"null".equals(unit)) {
 				name += "-" + unit;
-			} 
-			exportColumn[index + 1] = new String[] { name , "10", key };
+			}
+			exportColumn[index + 1] = new String[] { name, "10", key };
 		}
 		OutputStream outputStream = exportData(response, "Excel������", list, exportColumn);
 		outputStream.flush();
 		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 = 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);
+	}
+
+	@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