From 4b544975c973a27cd789cb23d0ac29da2890fd96 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 27 Sep 2023 14:49:24 +0800
Subject: [PATCH] feat:附件补充提交

---
 screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 aaefcd2..5ad395a 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,6 +5,7 @@
 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;
 
@@ -25,8 +26,27 @@
             * @Author: ���������
             * @Date: 2021/7/16
             */
-    List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
+    List<Map<String, Object>> 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