From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java
index b56c8e2..97206e3 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java
@@ -4,8 +4,12 @@
import java.util.List;
import java.util.Map;
+import com.moral.api.entity.Device;
import com.moral.api.entity.HistoryDaily;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.entity.HistoryMinutely;
+import com.moral.api.pojo.vo.historyMonthly.HistoryResultVo;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -47,6 +51,17 @@
*/
List<HistoryDaily> getHistoryDailyByMacAndTimeSlot( String mac, Date startDate,Date endDate);
+ List<HistoryDaily> getHistoryDailyByMacAndTimeSlot(List<String> macs, Date startDate, Date endDate);
+
+ /**
+ * ������������������������
+ * @param type
+ * @param macs
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<HistoryResultVo> listAvgResult(String type, List<String> macs, String startTime, String endTime);
/**
*@Description: ������������id���������������������������������������
*@Param: [map]
--
Gitblit v1.8.0