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/mapper/HistoryDailyMapper.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryDailyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryDailyMapper.java index 35614f0..c5c2e16 100644 --- a/screen-api/src/main/java/com/moral/api/mapper/HistoryDailyMapper.java +++ b/screen-api/src/main/java/com/moral/api/mapper/HistoryDailyMapper.java @@ -1,9 +1,12 @@ package com.moral.api.mapper; +import java.util.List; import java.util.Map; import com.moral.api.entity.HistoryDaily; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.moral.api.pojo.vo.historyMonthly.HistoryResultVo; +import org.apache.ibatis.annotations.Param; /** * <p> @@ -17,4 +20,5 @@ Map<String, Object> getAvgByMac(Map<String, Object> params); + List<HistoryResultVo> listAvgResult(@Param("type") String type, @Param("macs") List<String> macs, @Param("startTime") String startTime, @Param("endTime") String endTime); } -- Gitblit v1.8.0