From 7fb0113fb5bcb16d6e2930ba41020aff9c088be0 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 25 Sep 2018 10:45:03 +0800
Subject: [PATCH] 地图 更新

---
 src/main/java/com/moral/controller/ScreenController.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 3fdf54c..2478a83 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -110,6 +110,9 @@
 	@Resource
 	private WeatherService weatherService;
 	
+	@Resource 
+	private QualityDailyService qualityDailyService;
+
 	/**
 	 * Screen login. ������������
 	 * 
@@ -419,7 +422,7 @@
 	 * @return
 	 */
 	@RequestMapping(value = "/map-page", method = RequestMethod.GET)
-	public ModelAndView map(ModelAndView model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){
+	public ModelAndView map(ModelAndView model, @RequestParam("areaCode")long code, @RequestParam("accountId")int accountId){
 		Account account = accountService.getAccountById(accountId);
 		String regionName = areaService.queryFullNameByCode(code);
 		if(account!=null&&regionName!=null){
@@ -551,7 +554,8 @@
 	@GetMapping("report_alarm_datas")
 	public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
 		Map<String, Object> parameters = getParametersStartingWith(request, null);
-		parameters.put("type", "month");
+		ParameterUtils.getTimeType4Time(parameters);
+		//parameters.put("type", "month");
 		String sensorKey = "list";
 		if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
 			parameters.put("description", "description");
@@ -719,7 +723,7 @@
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "accountId",defaultValue = "1", value = "���������������id", required = true, paramType = "query", dataType = "String"),
 			@ApiImplicitParam(name = "sensorKey",defaultValue = "e1,e2,e3", value = "���������key,���������������������������", required = true, paramType = "query", dataType = "String"), 
-			@ApiImplicitParam(name = "time",defaultValue = "", value = "������(long���������������)", required = false, paramType = "query", dataType = "String"), 
+			@ApiImplicitParam(name = "time",defaultValue = "", value = "������(long������������)", required = false, paramType = "query", dataType = "String"), 
 			@ApiImplicitParam(name = "interval",defaultValue = "30", value = "���������������������", required = true, paramType = "query", dataType = "Integer"),
 	})
 	public ResultBean<Map<String, Object>> getActualDataByRegion(HttpServletRequest request) throws Exception {
@@ -727,4 +731,15 @@
 		Map<String, Object> map = historyService.getActualDataByRegion(parameters);
 		return new ResultBean<Map<String, Object>>(map);
 	}
+
+	@GetMapping("quality")
+	@ApiOperation(value = "������������������", notes = "������������������")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "organizationId",defaultValue = "5", value = "���������������������id", required = true, paramType = "query", dataType = "String")
+	})
+	public ResultBean<Map<String, Object>> getQualityCountDayByRegion(HttpServletRequest request) throws Exception {
+		Map<String, Object> parameters = getParametersStartingWith(request, null);
+		Map<String, Object> map = qualityDailyService.getQualityCountDayByRegion(parameters);
+		return new ResultBean<Map<String, Object>>(map);
+	}
 }

--
Gitblit v1.8.0