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/ServicePlusImpl.java | 48 +++++++++++++-----------------------------------
1 files changed, 13 insertions(+), 35 deletions(-)
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());
}
}
--
Gitblit v1.9.3