From 9655ea9ce8cdd671a766f87a0885b0fdff7b89c9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Aug 2023 17:12:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 0021494..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,7 +26,7 @@
* @Author: ���������
* @Date: 2021/7/16
*/
- List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
+ List<Map<String, Object>> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
/**
* @Description: ������������������������������������������
@@ -34,8 +35,18 @@
* @Author: ���������
* @Date: 2021/7/23
*/
- HistoryFiveMinutely queryLastDataByMac(String mac);
+ 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