From 93d71c576cd83db51a20f70d26eb74e20327ea30 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 01 Jul 2023 11:15:34 +0800
Subject: [PATCH] 测试提交

---
 screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
index 58e3e02..d107d5c 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
@@ -5,7 +5,9 @@
 import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;
 import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,4 +27,26 @@
             * @Date: 2021/7/16
             */
     List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
+
+    /**
+    * @Description: ������������������������������������������
+            * @Param: [mac]
+            * @return: java.util.List<com.moral.api.entity.HistoryFiveMinutely>
+            * @Author: ���������
+            * @Date: 2021/7/23
+            */
+    Map<String, Object> queryLastDataByMac(String mac);
+
+    //������5������������������
+    List<Object> getAreaWindData(Map<String,Object> params);
+
+    /**
+    * @Description: ������������������������������������+������+tvoc
+            * @Param: [mac]
+            * @return: java.util.Map<java.lang.String,java.lang.Object>
+            * @Author: ���������
+            * @Date: 2022/3/10
+            */
+    Map<String,Object> getPopDataByMac(Map<String, Object> params);
+
 }

--
Gitblit v1.8.0