From 28923b3d67c58b032bc4ff128aa1d5e62d73dba1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Feb 2024 10:07:58 +0800
Subject: [PATCH] fix:提交实时在线率接口
---
screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 58e3e02..3125d8d 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
@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;
import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;
+import com.moral.api.pojo.vo.historyFiveMinutely.QueryFiveDataByMacVO;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -24,5 +27,32 @@
* @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);
+ //������������������������������
+ List<Object> getAreaWindDataCenter(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);
+
+
+ QueryFiveDataByMacVO queryFiveDataByMac(String name,String chooseTime,String time);
+
}
--
Gitblit v1.8.0