update 更新自定义vo转化接口

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<T, K> extends IService<T> {
 
-	K getVoById(Serializable id, CopyOptions copyOptions);
+	K getVoById(Serializable id, CopyOptions copyOptions, Class<K> 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<T, K> extends IService<T> {
 		return convertor.apply(getById(id));
 	}
 
-	List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
+	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);
+	}
 
 	default List<K> listVoByIds(Collection<? extends Serializable> idList) {
 		return listVoByIds(idList, new CopyOptions());
@@ -45,7 +53,11 @@ public interface IServicePlus<T, K> extends IService<T> {
 		return convertor.apply(list);
 	}
 
-	List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
+	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);
+	}
 
 	default List<K> listVoByMap(Map<String, Object> columnMap) {
 		return listVoByMap(columnMap, new CopyOptions());
@@ -61,7 +73,11 @@ public interface IServicePlus<T, K> extends IService<T> {
 		return convertor.apply(list);
 	}
 
-	K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
+
+	default K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+		return getVoOne(queryWrapper, copyOptions, null);
+	}
 
 	default K getVoOne(Wrapper<T> queryWrapper) {
 		return getVoOne(queryWrapper, new CopyOptions());
@@ -71,7 +87,11 @@ public interface IServicePlus<T, K> extends IService<T> {
 		return convertor.apply(getOne(queryWrapper, true));
 	}
 
-	List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	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);
+	}
 
 	default List<K> listVo(Wrapper<T> queryWrapper) {
 		return listVo(queryWrapper, new CopyOptions());
@@ -93,7 +113,11 @@ public interface IServicePlus<T, K> extends IService<T> {
 		return listVo(Wrappers.emptyWrapper(), convertor);
 	}
 
-	PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	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);
+	}
 
 	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper) {
 		return pageVo(page, queryWrapper, new CopyOptions());

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

@@ -125,9 +125,9 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
 	 * @param id 主键ID
 	 */
 	@Override
-	public K getVoById(Serializable id, CopyOptions copyOptions) {
+	public K getVoById(Serializable id, CopyOptions copyOptions, Class<K> kClass) {
 		T t = getBaseMapper().selectById(id);
-		return oneVoCopy(t, copyOptions);
+		return oneVoCopy(t, copyOptions, kClass);
 	}
 
 	/**
@@ -136,12 +136,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) {
+	public List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions, Class<K> kClass) {
 		List<T> 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<M extends BaseMapperPlus<T>, T, K> extends ServiceI
 	 * @param columnMap 表字段 map 对象
 	 */
 	@Override
-	public List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
+	public List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions, Class<K> kClass) {
 		List<T> 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<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) {
+	public K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass) {
 		T t = getOne(queryWrapper, true);
-		return oneVoCopy(t, copyOptions);
+		return oneVoCopy(t, copyOptions, kClass);
 	}
 
 	/**
@@ -176,12 +176,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) {
+	public List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass) {
 		List<T> 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<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) {
+	public PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass) {
 		PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
-		List<K> volist = listVoCopy(result.getRecords(), copyOptions);
+		List<K> 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<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) {
+	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(voClass), copyOptions).copy())
+			.map(any -> BeanCopier.create(any, ReflectUtil.newInstanceIfPossible(finalVoClass), copyOptions).copy())
 			.collect(Collectors.toList());
 	}