wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具

This commit is contained in:
疯狂的狮子li 2021-07-27 11:07:33 +08:00
parent 79eb42d3fe
commit 7cf6064200
3 changed files with 129 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
View File

@ -20,30 +20,38 @@ import java.util.function.Function;
*/
public interface IServicePlus<T, K> extends IService<T> {
K getVoById(Serializable id, CopyOptions copyOptions, Class<K> kClass);
default K getVoById(Serializable id, CopyOptions copyOptions) {
return getVoById(id, copyOptions, null);
}
/**
* @param id 主键id
* @param copyOptions copy条件
* @return K对象
*/
K getVoById(Serializable id, CopyOptions copyOptions);
default K getVoById(Serializable id) {
return getVoById(id, new CopyOptions());
}
/**
* @param convertor 自定义转换器
*/
default K getVoById(Serializable id, Function<T, K> convertor) {
return convertor.apply(getById(id));
}
List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions, Class<K> kClass);
default List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
return listVoByIds(idList, copyOptions, null);
}
/**
* @param idList id列表
* @param copyOptions copy条件
* @return K对象
*/
List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
default List<K> listVoByIds(Collection<? extends Serializable> idList) {
return listVoByIds(idList, new CopyOptions());
}
/**
* @param convertor 自定义转换器
*/
default List<K> listVoByIds(Collection<? extends Serializable> idList,
Function<Collection<T>, List<K>> convertor) {
List<T> list = getBaseMapper().selectBatchIds(idList);
@ -53,17 +61,20 @@ public interface IServicePlus<T, K> extends IService<T> {
return convertor.apply(list);
}
List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions, Class<K> kClass);
default List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
return listVoByMap(columnMap, copyOptions, null);
}
/**
* @param columnMap 表字段 map 对象
* @param copyOptions copy条件
* @return K对象
*/
List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
default List<K> listVoByMap(Map<String, Object> columnMap) {
return listVoByMap(columnMap, new CopyOptions());
}
/**
* @param convertor 自定义转换器
*/
default List<K> listVoByMap(Map<String, Object> columnMap,
Function<Collection<T>, List<K>> convertor) {
List<T> list = getBaseMapper().selectByMap(columnMap);
@ -73,30 +84,38 @@ public interface IServicePlus<T, K> extends IService<T> {
return convertor.apply(list);
}
K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
default K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
return getVoOne(queryWrapper, copyOptions, null);
}
/**
* @param queryWrapper 查询条件
* @param copyOptions copy条件
* @return K对象
*/
K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
default K getVoOne(Wrapper<T> queryWrapper) {
return getVoOne(queryWrapper, new CopyOptions());
}
/**
* @param convertor 自定义转换器
*/
default K getVoOne(Wrapper<T> queryWrapper, Function<T, K> convertor) {
return convertor.apply(getOne(queryWrapper, true));
}
List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
default List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
return listVo(queryWrapper, copyOptions, null);
}
/**
* @param queryWrapper 查询条件
* @param copyOptions copy条件
* @return K对象
*/
List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
default List<K> listVo(Wrapper<T> queryWrapper) {
return listVo(queryWrapper, new CopyOptions());
}
/**
* @param convertor 自定义转换器
*/
default List<K> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<K>> convertor) {
List<T> list = getBaseMapper().selectList(queryWrapper);
if (list == null) {
@ -109,20 +128,28 @@ public interface IServicePlus<T, K> extends IService<T> {
return listVo(Wrappers.emptyWrapper());
}
/**
* @param convertor 自定义转换器
*/
default List<K> listVo(Function<Collection<T>, List<K>> convertor) {
return listVo(Wrappers.emptyWrapper(), convertor);
}
PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
return pageVo(page, queryWrapper, copyOptions, null);
}
/**
* @param page 分页对象
* @param queryWrapper 查询条件
* @param copyOptions copy条件
* @return K对象
*/
PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper) {
return pageVo(page, queryWrapper, new CopyOptions());
}
/**
* @param convertor 自定义转换器
*/
default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper,
Function<Collection<T>, List<K>> convertor) {
PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
@ -133,6 +160,9 @@ public interface IServicePlus<T, K> extends IService<T> {
return pageVo(page, Wrappers.emptyWrapper());
}
/**
* @param convertor 自定义转换器
*/
default PagePlus<T, K> pageVo(PagePlus<T, K> page, Function<Collection<T>, List<K>> convertor) {
return pageVo(page, Wrappers.emptyWrapper(), convertor);
}

48
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
View File

@ -1,12 +1,11 @@
package com.ruoyi.common.core.mybatisplus.core;
import cn.hutool.core.bean.copier.BeanCopier;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.util.ReflectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.utils.BeanCopyUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.ResolvableType;
@ -15,7 +14,6 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* IServicePlus 实现类
@ -125,9 +123,9 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
* @param id 主键ID
*/
@Override
public K getVoById(Serializable id, CopyOptions copyOptions, Class<K> kClass) {
public K getVoById(Serializable id, CopyOptions copyOptions) {
T t = getBaseMapper().selectById(id);
return oneVoCopy(t, copyOptions, kClass);
return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
}
/**
@ -136,12 +134,12 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
* @param idList 主键ID列表
*/
@Override
public List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions, Class<K> kClass) {
public List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
List<T> list = getBaseMapper().selectBatchIds(idList);
if (list == null) {
return null;
}
return listVoCopy(list, copyOptions, kClass);
return BeanCopyUtils.listCopy(list, copyOptions, voClass);
}
/**
@ -150,12 +148,12 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
* @param columnMap 表字段 map 对象
*/
@Override
public List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions, Class<K> kClass) {
public List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
List<T> list = getBaseMapper().selectByMap(columnMap);
if (list == null) {
return null;
}
return listVoCopy(list, copyOptions, kClass);
return BeanCopyUtils.listCopy(list, copyOptions, voClass);
}
/**
@ -165,9 +163,9 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
* @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
public K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass) {
public K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
T t = getOne(queryWrapper, true);
return oneVoCopy(t, copyOptions, kClass);
return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
}
/**
@ -176,12 +174,12 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
* @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
public List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass) {
public List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
List<T> list = getBaseMapper().selectList(queryWrapper);
if (list == null) {
return null;
}
return listVoCopy(list, copyOptions, kClass);
return BeanCopyUtils.listCopy(list, copyOptions, voClass);
}
/**
@ -191,31 +189,11 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
* @param queryWrapper 实体对象封装操作类
*/
@Override
public PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass) {
public PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
List<K> volist = listVoCopy(result.getRecords(), copyOptions, kClass);
List<K> volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass);
result.setRecordsVo(volist);
return result;
}
private K oneVoCopy(T t, CopyOptions copyOptions, Class<K> kClass) {
Class<K> voClass = this.voClass;
if (kClass != null) {
voClass = kClass;
}
K k = ReflectUtil.newInstanceIfPossible(voClass);
return BeanCopier.create(t, k, copyOptions).copy();
}
private List<K> listVoCopy(List<T> list, CopyOptions copyOptions, Class<K> kClass) {
Class<K> voClass = this.voClass;
if (kClass != null) {
voClass = kClass;
}
final Class<K> finalVoClass = voClass;
return list.stream()
.map(any -> BeanCopier.create(any, ReflectUtil.newInstanceIfPossible(finalVoClass), copyOptions).copy())
.collect(Collectors.toList());
}
}

55
ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java Normal file
View File

@ -0,0 +1,55 @@
package com.ruoyi.common.utils;
import cn.hutool.core.bean.copier.BeanCopier;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.util.ReflectUtil;
import java.util.List;
import java.util.stream.Collectors;
/**
* bean深拷贝工具
*
* @author Lion Li
*/
public class BeanCopyUtils {
/**
* 单对象基于class创建拷贝
*
* @param source 数据来源实体
* @param copyOptions copy条件
* @param desc 描述对象 转换后的对象
* @return desc
*/
public static <T, V> V oneCopy(T source, CopyOptions copyOptions, Class<V> desc) {
V v = ReflectUtil.newInstanceIfPossible(desc);
return oneCopy(source, copyOptions, v);
}
/**
* 单对象基于对象创建拷贝
*
* @param source 数据来源实体
* @param copyOptions copy条件
* @param desc 转换后的对象
* @return desc
*/
public static <T, V> V oneCopy(T source, CopyOptions copyOptions, V desc) {
return BeanCopier.create(source, desc, copyOptions).copy();
}
/**
* 列表对象基于class创建拷贝
*
* @param sourceList 数据来源实体列表
* @param copyOptions copy条件
* @param desc 描述对象 转换后的对象
* @return desc
*/
public static <T, V> List<V> listCopy(List<T> sourceList, CopyOptions copyOptions, Class<V> desc) {
return sourceList.stream()
.map(source -> oneCopy(source, copyOptions, desc))
.collect(Collectors.toList());
}
}