From 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c Mon Sep 17 00:00:00 2001 From: swb <jpy123456> Date: Mon, 21 Oct 2024 09:01:18 +0800 Subject: [PATCH] fix:立行立改责任主体修改提交 --- 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