diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java index e2d9a3dd..069c6a71 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java @@ -20,7 +20,11 @@ import java.util.function.Function; */ public interface IServicePlus extends IService { - K getVoById(Serializable id, CopyOptions copyOptions); + K getVoById(Serializable id, CopyOptions copyOptions, Class kClass); + + default K getVoById(Serializable id, CopyOptions copyOptions) { + return getVoById(id, copyOptions, null); + } default K getVoById(Serializable id) { return getVoById(id, new CopyOptions()); @@ -30,7 +34,11 @@ public interface IServicePlus extends IService { return convertor.apply(getById(id)); } - List listVoByIds(Collection idList, CopyOptions copyOptions); + List listVoByIds(Collection idList, CopyOptions copyOptions, Class kClass); + + default List listVoByIds(Collection idList, CopyOptions copyOptions) { + return listVoByIds(idList, copyOptions, null); + } default List listVoByIds(Collection idList) { return listVoByIds(idList, new CopyOptions()); @@ -45,7 +53,11 @@ public interface IServicePlus extends IService { return convertor.apply(list); } - List listVoByMap(Map columnMap, CopyOptions copyOptions); + List listVoByMap(Map columnMap, CopyOptions copyOptions, Class kClass); + + default List listVoByMap(Map columnMap, CopyOptions copyOptions) { + return listVoByMap(columnMap, copyOptions, null); + } default List listVoByMap(Map columnMap) { return listVoByMap(columnMap, new CopyOptions()); @@ -61,7 +73,11 @@ public interface IServicePlus extends IService { return convertor.apply(list); } - K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions); + K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions, Class kClass); + + default K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions) { + return getVoOne(queryWrapper, copyOptions, null); + } default K getVoOne(Wrapper queryWrapper) { return getVoOne(queryWrapper, new CopyOptions()); @@ -71,7 +87,11 @@ public interface IServicePlus extends IService { return convertor.apply(getOne(queryWrapper, true)); } - List listVo(Wrapper queryWrapper, CopyOptions copyOptions); + List listVo(Wrapper queryWrapper, CopyOptions copyOptions, Class kClass); + + default List listVo(Wrapper queryWrapper, CopyOptions copyOptions) { + return listVo(queryWrapper, copyOptions, null); + } default List listVo(Wrapper queryWrapper) { return listVo(queryWrapper, new CopyOptions()); @@ -93,7 +113,11 @@ public interface IServicePlus extends IService { return listVo(Wrappers.emptyWrapper(), convertor); } - PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions); + PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions, Class kClass); + + default PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions) { + return pageVo(page, queryWrapper, copyOptions, null); + } default PagePlus pageVo(PagePlus page, Wrapper queryWrapper) { return pageVo(page, queryWrapper, new CopyOptions()); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java index 0325431f..5f0a82f6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java @@ -125,9 +125,9 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param id 主键ID */ @Override - public K getVoById(Serializable id, CopyOptions copyOptions) { + public K getVoById(Serializable id, CopyOptions copyOptions, Class kClass) { T t = getBaseMapper().selectById(id); - return oneVoCopy(t, copyOptions); + return oneVoCopy(t, copyOptions, kClass); } /** @@ -136,12 +136,12 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param idList 主键ID列表 */ @Override - public List listVoByIds(Collection idList, CopyOptions copyOptions) { + public List listVoByIds(Collection idList, CopyOptions copyOptions, Class kClass) { List list = getBaseMapper().selectBatchIds(idList); if (list == null) { return null; } - return listVoCopy(list, copyOptions); + return listVoCopy(list, copyOptions, kClass); } /** @@ -150,12 +150,12 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param columnMap 表字段 map 对象 */ @Override - public List listVoByMap(Map columnMap, CopyOptions copyOptions) { + public List listVoByMap(Map columnMap, CopyOptions copyOptions, Class kClass) { List list = getBaseMapper().selectByMap(columnMap); if (list == null) { return null; } - return listVoCopy(list, copyOptions); + return listVoCopy(list, copyOptions, kClass); } /** @@ -165,9 +165,9 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} */ @Override - public K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions) { + public K getVoOne(Wrapper queryWrapper, CopyOptions copyOptions, Class kClass) { T t = getOne(queryWrapper, true); - return oneVoCopy(t, copyOptions); + return oneVoCopy(t, copyOptions, kClass); } /** @@ -176,12 +176,12 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper} */ @Override - public List listVo(Wrapper queryWrapper, CopyOptions copyOptions) { + public List listVo(Wrapper queryWrapper, CopyOptions copyOptions, Class kClass) { List list = getBaseMapper().selectList(queryWrapper); if (list == null) { return null; } - return listVoCopy(list, copyOptions); + return listVoCopy(list, copyOptions, kClass); } /** @@ -191,21 +191,30 @@ public class ServicePlusImpl, T, K> extends ServiceI * @param queryWrapper 实体对象封装操作类 */ @Override - public PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions) { + public PagePlus pageVo(PagePlus page, Wrapper queryWrapper, CopyOptions copyOptions, Class kClass) { PagePlus result = getBaseMapper().selectPage(page, queryWrapper); - List volist = listVoCopy(result.getRecords(), copyOptions); + List volist = listVoCopy(result.getRecords(), copyOptions, kClass); result.setRecordsVo(volist); return result; } - private K oneVoCopy(T t, CopyOptions copyOptions) { + private K oneVoCopy(T t, CopyOptions copyOptions, Class kClass) { + Class voClass = this.voClass; + if (kClass != null) { + voClass = kClass; + } K k = ReflectUtil.newInstanceIfPossible(voClass); return BeanCopier.create(t, k, copyOptions).copy(); } - private List listVoCopy(List list, CopyOptions copyOptions) { + private List listVoCopy(List list, CopyOptions copyOptions, Class kClass) { + Class voClass = this.voClass; + if (kClass != null) { + voClass = kClass; + } + final Class finalVoClass = voClass; return list.stream() - .map(any -> BeanCopier.create(any, ReflectUtil.newInstanceIfPossible(voClass), copyOptions).copy()) + .map(any -> BeanCopier.create(any, ReflectUtil.newInstanceIfPossible(finalVoClass), copyOptions).copy()) .collect(Collectors.toList()); }