From 50e24cdfd75ada4dd6ea5dce74803b7f96e3ba81 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 15 Aug 2019 17:20:52 +0800
Subject: [PATCH] 添加无人机历史查询最大值和最小值的Mapper接口

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5f1f7eb..1797eaa 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������������������������������������������
@@ -1156,8 +1166,8 @@
     @ApiOperation(value = "���������������������������", notes = "���������������������������")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392068���", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "startTime", value = "������������(���������2019-07-17 17:07:00)", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "������������(���������2019-07-17 17:07:00)", required = true, paramType = "query", dataType = "String")
     })
     public ModelAndView uavTrajectory(ModelAndView model, HttpServletRequest request) throws Exception {
         Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);

--
Gitblit v1.8.0