From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java | 11 +++++++++++
1 files changed, 11 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 0825277..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
@@ -8,6 +8,8 @@
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>
@@ -52,6 +54,15 @@
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]
*@return: java.util.Map<java.lang.String,java.lang.Object>
--
Gitblit v1.8.0