From 1b752c35cc0c7f51922351d5bcca88a043002ae8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 06 十二月 2021 10:40:57 +0800
Subject: [PATCH] update 使用 Cglib 重构 BeanCopyUtils 性能优异
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 43 ++------------
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java | 25 ++++----
ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java | 95 ++++++++++++++++++++++++-------
3 files changed, 91 insertions(+), 72 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 815791b..6b373ff 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
@@ -1,6 +1,5 @@
package com.ruoyi.common.core.mybatisplus.core;
-import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -23,14 +22,9 @@
/**
* @param id 涓婚敭id
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- V getVoById(Serializable id, CopyOptions copyOptions);
-
- default V getVoById(Serializable id) {
- return getVoById(id, new CopyOptions());
- }
+ V getVoById(Serializable id);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -41,14 +35,9 @@
/**
* @param idList id鍒楄〃
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
-
- default List<V> listVoByIds(Collection<? extends Serializable> idList) {
- return listVoByIds(idList, new CopyOptions());
- }
+ List<V> listVoByIds(Collection<? extends Serializable> idList);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -64,14 +53,9 @@
/**
* @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
-
- default List<V> listVoByMap(Map<String, Object> columnMap) {
- return listVoByMap(columnMap, new CopyOptions());
- }
+ List<V> listVoByMap(Map<String, Object> columnMap);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -87,14 +71,9 @@
/**
* @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
- default V getVoOne(Wrapper<T> queryWrapper) {
- return getVoOne(queryWrapper, new CopyOptions());
- }
+ V getVoOne(Wrapper<T> queryWrapper);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -105,14 +84,9 @@
/**
* @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
- default List<V> listVo(Wrapper<T> queryWrapper) {
- return listVo(queryWrapper, new CopyOptions());
- }
+ List<V> listVo(Wrapper<T> queryWrapper);
/**
* @param convertor 鑷畾涔夎浆鎹㈠櫒
@@ -139,14 +113,9 @@
/**
* @param page 鍒嗛〉瀵硅薄
* @param queryWrapper 鏌ヨ鏉′欢
- * @param copyOptions copy鏉′欢
* @return V瀵硅薄
*/
- PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
-
- default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
- return pageVo(page, queryWrapper, new CopyOptions());
- }
+ PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper);
/**
* @param 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 e9c1f19..4de5b32 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,6 +1,5 @@
package com.ruoyi.common.core.mybatisplus.core;
-import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -165,9 +164,9 @@
* @param id 涓婚敭ID
*/
@Override
- public V getVoById(Serializable id, CopyOptions copyOptions) {
+ public V getVoById(Serializable id) {
T t = getBaseMapper().selectById(id);
- return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
+ return BeanCopyUtils.copy(t, voClass);
}
/**
@@ -176,12 +175,12 @@
* @param idList 涓婚敭ID鍒楄〃
*/
@Override
- public List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
+ public List<V> listVoByIds(Collection<? extends Serializable> idList) {
List<T> list = getBaseMapper().selectBatchIds(idList);
if (list == null) {
return null;
}
- return BeanCopyUtils.listCopy(list, copyOptions, voClass);
+ return BeanCopyUtils.copyList(list, voClass);
}
/**
@@ -190,12 +189,12 @@
* @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
*/
@Override
- public List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
+ public List<V> listVoByMap(Map<String, Object> columnMap) {
List<T> list = getBaseMapper().selectByMap(columnMap);
if (list == null) {
return null;
}
- return BeanCopyUtils.listCopy(list, copyOptions, voClass);
+ return BeanCopyUtils.copyList(list, voClass);
}
/**
@@ -205,9 +204,9 @@
* @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
- public V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+ public V getVoOne(Wrapper<T> queryWrapper) {
T t = getOne(queryWrapper, true);
- return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
+ return BeanCopyUtils.copy(t, voClass);
}
/**
@@ -216,12 +215,12 @@
* @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
- public List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+ public List<V> listVo(Wrapper<T> queryWrapper) {
List<T> list = getBaseMapper().selectList(queryWrapper);
if (list == null) {
return null;
}
- return BeanCopyUtils.listCopy(list, copyOptions, voClass);
+ return BeanCopyUtils.copyList(list, voClass);
}
/**
@@ -231,9 +230,9 @@
* @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
*/
@Override
- public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+ public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
- List<V> volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass);
+ List<V> volist = BeanCopyUtils.copyList(result.getRecords(), voClass);
result.setRecordsVo(volist);
return result;
}
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
index 8bf40d1..3bc4434 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -1,16 +1,16 @@
package com.ruoyi.common.utils;
-import cn.hutool.core.bean.copier.BeanCopier;
-import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.extra.cglib.CglibUtil;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
/**
- * bean娣辨嫹璐濆伐鍏�
+ * bean娣辨嫹璐濆伐鍏�(鍩轰簬 cglib 鎬ц兘浼樺紓)
*
* @author Lion Li
*/
@@ -19,48 +19,99 @@
/**
* 鍗曞璞″熀浜巆lass鍒涘缓鎷疯礉
*
- * @param source 鏁版嵁鏉ユ簮瀹炰綋
- * @param copyOptions copy鏉′欢
- * @param desc 鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
+ * @param source 鏁版嵁鏉ユ簮瀹炰綋
+ * @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);
+ public static <T, V> V copy(T source, Class<V> desc) {
+ if (ObjectUtil.isNull(source)) {
+ return null;
+ }
+ if (ObjectUtil.isNull(desc)) {
+ return null;
+ }
+ return CglibUtil.copy(source, desc);
}
/**
* 鍗曞璞″熀浜庡璞″垱寤烘嫹璐�
*
- * @param source 鏁版嵁鏉ユ簮瀹炰綋
- * @param copyOptions copy鏉′欢
- * @param desc 杞崲鍚庣殑瀵硅薄
+ * @param source 鏁版嵁鏉ユ簮瀹炰綋
+ * @param desc 杞崲鍚庣殑瀵硅薄
* @return desc
*/
- public static <T, V> V oneCopy(T source, CopyOptions copyOptions, V desc) {
+ public static <T, V> V copy(T source, V desc) {
if (ObjectUtil.isNull(source)) {
return null;
}
- return BeanCopier.create(source, desc, copyOptions).copy();
+ if (ObjectUtil.isNull(desc)) {
+ return null;
+ }
+ CglibUtil.copy(source, desc);
+ return desc;
}
/**
* 鍒楄〃瀵硅薄鍩轰簬class鍒涘缓鎷疯礉
*
- * @param sourceList 鏁版嵁鏉ユ簮瀹炰綋鍒楄〃
- * @param copyOptions copy鏉′欢
- * @param desc 鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
+ * @param sourceList 鏁版嵁鏉ユ簮瀹炰綋鍒楄〃
+ * @param desc 鎻忚堪瀵硅薄 杞崲鍚庣殑瀵硅薄
* @return desc
*/
- public static <T, V> List<V> listCopy(List<T> sourceList, CopyOptions copyOptions, Class<V> desc) {
+ public static <T, V> List<V> copyList(List<T> sourceList, Class<V> desc) {
if (ObjectUtil.isNull(sourceList)) {
return null;
}
if (CollUtil.isEmpty(sourceList)) {
return CollUtil.newArrayList();
}
- return sourceList.stream()
- .map(source -> oneCopy(source, copyOptions, desc))
- .collect(Collectors.toList());
+ return CglibUtil.copyList(sourceList, () -> ReflectUtil.newInstanceIfPossible(desc));
+ }
+
+ /**
+ * bean鎷疯礉鍒癿ap
+ *
+ * @param bean 鏁版嵁鏉ユ簮瀹炰綋
+ * @return map瀵硅薄
+ */
+ public static <T> Map<String, Object> copyToMap(T bean) {
+ if (ObjectUtil.isNull(bean)) {
+ return null;
+ }
+ return CglibUtil.toMap(bean);
+ }
+
+ /**
+ * map鎷疯礉鍒癰ean
+ *
+ * @param map 鏁版嵁鏉ユ簮
+ * @param beanClass bean绫�
+ * @return bean瀵硅薄
+ */
+ public static <T> T mapToBean(Map<String, Object> map, Class<T> beanClass) {
+ if (MapUtil.isEmpty(map)) {
+ return null;
+ }
+ if (ObjectUtil.isNull(beanClass)) {
+ return null;
+ }
+ return CglibUtil.toBean(map, beanClass);
+ }
+
+ /**
+ * map鎷疯礉鍒癰ean
+ *
+ * @param map 鏁版嵁鏉ユ簮
+ * @param bean bean瀵硅薄
+ * @return bean瀵硅薄
+ */
+ public static <T> T mapToBean(Map<String, Object> map, T bean) {
+ if (MapUtil.isEmpty(map)) {
+ return null;
+ }
+ if (ObjectUtil.isNull(bean)) {
+ return null;
+ }
+ return CglibUtil.fillBean(map, bean);
}
}
--
Gitblit v1.9.3