From 002f9e7d3576cc85bc5decd42c7bce02ef4bb6c4 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 18 Dec 2023 12:59:44 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java | 10 ++++++++--
1 files changed, 8 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 2572c8d..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,6 +4,7 @@
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;
@@ -26,7 +27,7 @@
* @Author: ���������
* @Date: 2021/7/16
*/
- List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
+ List<Map<String, Object>> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form);
/**
* @Description: ������������������������������������������
@@ -39,6 +40,8 @@
//������5������������������
List<Object> getAreaWindData(Map<String,Object> params);
+ //������������������������������
+ List<Object> getAreaWindDataCenter(Map<String,Object> params);
/**
* @Description: ������������������������������������+������+tvoc
@@ -47,6 +50,9 @@
* @Author: ���������
* @Date: 2022/3/10
*/
- Map<String,Object> getPopDataByMac(String mac);
+ Map<String,Object> getPopDataByMac(Map<String, Object> params);
+
+
+ QueryFiveDataByMacVO queryFiveDataByMac(String name,String chooseTime,String time);
}
--
Gitblit v1.8.0