From da5a1293b3f40ab176629a7fb2bb5901bf9ae4af Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 26 七月 2021 13:12:03 +0800
Subject: [PATCH] update 更新自定义vo转化接口
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 36 +++++++++++++++---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java | 39 ++++++++++++-------
2 files changed, 54 insertions(+), 21 deletions(-)
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 e2d9a3d..069c6a7 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 @@
*/
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 @@
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 @@
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 @@
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 @@
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 @@
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());
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 0325431..5f0a82f 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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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());
}
--
Gitblit v1.9.3