From 7cf60642001238dfd1cbe522cdd842620855a59e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 27 七月 2021 11:07:33 +0800
Subject: [PATCH] update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 92 +++++++++++++++-------
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java | 48 +++--------
ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java | 55 +++++++++++++
3 files changed, 129 insertions(+), 66 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 069c6a7..710f11a 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,30 +20,38 @@
*/
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 @@
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 @@
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 @@
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 @@
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);
}
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 5f0a82f..4c339b8 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
@@ -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.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* IServicePlus 瀹炵幇绫�
@@ -125,9 +123,9 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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());
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
new file mode 100644
index 0000000..bea09f8
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -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 {
+
+ /**
+ * 鍗曞璞″熀浜巆lass鍒涘缓鎷疯礉
+ *
+ * @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());
+ }
+}
--
Gitblit v1.9.3