From 129e7dde5da351e111c53d34b7dfa0d4c1f896ef Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 08 Dec 2020 10:09:53 +0800
Subject: [PATCH] 添加网页版获取单台设备一个小时AQI接口以及获取单台设备的某一个传感器月平均值

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

diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index ee8cdb8..d008ceb 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -64,6 +64,8 @@
     OrganizationSensorsService organizationSensorsService;
     @Resource
     MapPathService mapPathService;
+    @Resource
+    HistoryService historyService;
 
 
     @GetMapping("test")
@@ -493,6 +495,13 @@
         return new ResultBean<>(mapPath);
     }
 
+    /**
+    * @Description: ������������������������
+            * @Param: [request]
+            * @return: com.moral.common.bean.ResultBean<java.util.List<com.moral.entity.MonitorPoint>>
+            * @Author: ������������
+            * @Date: 2020/12/8
+            */
     @UserLoginToken
     @GetMapping("monitor-points")
     public ResultBean<List<MonitorPoint>> getmMnitorPoints(HttpServletRequest request) {
@@ -510,6 +519,41 @@
 
 
     /**
+    * @Description: ���������������������������������������������������
+            * @Param: [datas, devices]
+            * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+            * @Author: ������������
+            * @Date: 2020/12/8
+            */
+    @UserLoginToken
+    @GetMapping("sensor-monthAvg")
+    public ResultBean<Map<String, Object>> getSensorMonthAvgByMac(HttpServletRequest request){
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        if ((!parameters.containsKey("mac"))||(!parameters.containsKey("macKey")))
+            return ResultBean.fail("���������null");
+        Map<String, Object> result = historyMinutelyService.getAverageBySensor(parameters);
+        return new ResultBean<Map<String, Object>>(result);
+    }
+
+    /**
+    * @Description: ���������������������������������AQI
+            * @Param: [request]
+            * @return: com.moral.common.bean.ResultBean<java.util.Map<java.lang.String,java.lang.Object>>
+            * @Author: ������������
+            * @Date: 2020/12/8
+            */
+    @UserLoginToken
+    @GetMapping("hourly-aqi")
+    public ResultBean<Map<String, Object>> getHourlyAQI(HttpServletRequest request){
+        Map<String, Object> parameters = getParametersStartingWith(request, null);
+        if (!parameters.containsKey("mac"))
+            return ResultBean.fail("���������null");
+        Map<String, Object> result = historyService.gitHourlyAQIByMacAndTimeslot(parameters);
+        return new ResultBean<Map<String, Object>>(result);
+    }
+
+
+    /**
      * @Description: ���������������������������������������state
      * @Param: [datas, devices]
      * @Author: ������������

--
Gitblit v1.8.0