From 3db7f8ce74ebb8dd447388628ef1c59be340785c Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Sun, 3 Aug 2025 16:22:53 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=99=A8=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/core/mapper/BaseMapperPlus.java | 33 +++++++++++++++++++ .../mybatis/handler/BatchResultHandler.java | 8 ----- .../mybatis/handler/FilterResultHandler.java | 7 ---- .../mybatis/handler/SimpleResultHandler.java | 4 --- 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java index 0d777f4e0..9785b0832 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java @@ -15,12 +15,15 @@ import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.mybatis.handler.FilterResultHandler; import java.io.Serializable; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.function.Function; +import java.util.function.Predicate; /** * 自定义 Mapper 接口, 实现 自定义扩展 @@ -355,4 +358,34 @@ public interface BaseMapperPlus extends BaseMapper { return StreamUtils.toList(this.selectObjs(wrapper), mapper); } + /** + * 根据查询条件和过滤条件查询数据，并将结果转换为指定的VO类型列表 + * + * @param wrapper 查询条件Wrapper + * @param filter 结果过滤条件 + * @return 查询到的符合条件的对象列表，经过转换为指定类型的对象后返回 + */ + default List selectFilterVoList(Wrapper wrapper, Predicate filter) { + return this.selectFilterVoList(wrapper, filter, this.currentVoClass()); + } + + /** + * 根据查询条件和过滤条件查询数据，并将结果转换为指定的VO类型列表 + * + * @param wrapper 查询条件Wrapper + * @param filter 结果过滤条件 + * @param voClass 要转换的VO类的Class对象 + * @param VO类的类型 + * @return 查询到的符合条件的对象列表，经过转换为指定类型的对象后返回 + */ + default List selectFilterVoList(Wrapper wrapper, Predicate filter, Class voClass) { + List list = new ArrayList<>(); + // 使用过滤处理器过滤数据，并将符合条件的结果加入 list + this.selectList(wrapper, new FilterResultHandler<>(filter, list::add)); + + if (CollUtil.isEmpty(list)) { + return CollUtil.newArrayList(); + } + return MapstructUtils.convert(list, voClass); + } } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/BatchResultHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/BatchResultHandler.java index bd505a038..cfa7a6233 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/BatchResultHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/BatchResultHandler.java @@ -59,16 +59,8 @@ public class BatchResultHandler implements ResultHandler { * * @param batchConsumer 批量消费函数，不能为null * @param batchSize 批量大小，必须大于0 - * @throws NullPointerException batchConsumer为null时抛出 - * @throws IllegalArgumentException batchSize小于等于0时抛出 */ public BatchResultHandler(Consumer> batchConsumer, int batchSize) { - if (batchConsumer == null) { - throw new NullPointerException("batchConsumer不能为null"); - } - if (batchSize <= 0) { - throw new IllegalArgumentException("batchSize必须大于0"); - } this.batchConsumer = batchConsumer; this.batchSize = batchSize; this.buffer = new ArrayList<>(batchSize); diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/FilterResultHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/FilterResultHandler.java index 6496458d6..0c9096700 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/FilterResultHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/FilterResultHandler.java @@ -35,15 +35,8 @@ public class FilterResultHandler implements ResultHandler { * * @param filter 过滤条件 * @param consumer 满足过滤条件时的处理函数 - * @throws NullPointerException 如果 filter 或 consumer 为 null */ public FilterResultHandler(Predicate filter, Consumer consumer) { - if (filter == null) { - throw new NullPointerException("过滤条件，不能为空"); - } - if (consumer == null) { - throw new NullPointerException("处理函数，不能为空"); - } this.filter = filter; this.consumer = consumer; } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/SimpleResultHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/SimpleResultHandler.java index c5950da1a..13dc06010 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/SimpleResultHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/SimpleResultHandler.java @@ -25,12 +25,8 @@ public class SimpleResultHandler implements ResultHandler { * 构造 SimpleResultHandler 实例 * * @param consumer 处理单条查询结果的消费函数，不能为空 - * @throws NullPointerException 如果 consumer 为 null 抛出 */ public SimpleResultHandler(Consumer consumer) { - if (consumer == null) { - throw new NullPointerException("consumer不能为null"); - } this.consumer = consumer; }