From ed2a9d376c3846bb8d6cf838bfff9bd3ae07bc3b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:52:05 +0800
Subject: [PATCH] 修改多点重合下拉时第一个时间位置不变问题

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 54c82d9..662378a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -365,9 +365,12 @@
     
     @GetMapping("hour-aqi")
     @ApiOperation(value = "���������������AQI", notes = "���������������AQI")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "mac", value = "������mac������", required = true, paramType = "query", dataType = "String")
+    })
     public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {
     	Map<String, Object> parameters = getParametersStartingWith(request, null);
-    	return historyMinutelyService.getHourAQIByDevice(parameters);
+    	return historyService.gitHourlyAQIByMacAndTimeslot(parameters);
     }
 
     /**

--
Gitblit v1.8.0