From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5f1f7eb..662378a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -362,6 +362,16 @@
         Map<String, Object> parameters = getParametersStartingWith(request, null);
         return historyMinutelyService.getDayAQIByDevice(parameters);
     }
+    
+    @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 historyService.gitHourlyAQIByMacAndTimeslot(parameters);
+    }
 
     /**
      * Gets the average by all. ������������������������10������������5������������������������������������������

--
Gitblit v1.8.0