From b19111b9bffe99f65ac08a85d40bb2f186dd264a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:04 +0800
Subject: [PATCH] Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 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 0325431..e00076e 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 瀹炵幇绫�
@@ -95,6 +93,10 @@
return super.updateBatchById(entityList, batchSize);
}
+ /**
+ * 鍗晄ql鎵归噺鎻掑叆( 鍏ㄩ噺濉厖 鏃犺鏁版嵁搴撻粯璁ゅ�� )
+ * 閫傜敤浜庢棤鑴戞彃鍏�
+ */
@Override
public boolean saveBatch(Collection<T> entityList) {
return saveBatch(entityList, DEFAULT_BATCH_SIZE);
@@ -127,7 +129,7 @@
@Override
public K getVoById(Serializable id, CopyOptions copyOptions) {
T t = getBaseMapper().selectById(id);
- return oneVoCopy(t, copyOptions);
+ return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
}
/**
@@ -141,7 +143,7 @@
if (list == null) {
return null;
}
- return listVoCopy(list, copyOptions);
+ return BeanCopyUtils.listCopy(list, copyOptions, voClass);
}
/**
@@ -155,7 +157,7 @@
if (list == null) {
return null;
}
- return listVoCopy(list, copyOptions);
+ return BeanCopyUtils.listCopy(list, copyOptions, voClass);
}
/**
@@ -167,7 +169,7 @@
@Override
public K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
T t = getOne(queryWrapper, true);
- return oneVoCopy(t, copyOptions);
+ return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
}
/**
@@ -181,7 +183,7 @@
if (list == null) {
return null;
}
- return listVoCopy(list, copyOptions);
+ return BeanCopyUtils.listCopy(list, copyOptions, voClass);
}
/**
@@ -193,20 +195,9 @@
@Override
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);
+ List<K> volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass);
result.setRecordsVo(volist);
return result;
- }
-
- private K oneVoCopy(T t, CopyOptions copyOptions) {
- K k = ReflectUtil.newInstanceIfPossible(voClass);
- return BeanCopier.create(t, k, copyOptions).copy();
- }
-
- private List<K> listVoCopy(List<T> list, CopyOptions copyOptions) {
- return list.stream()
- .map(any -> BeanCopier.create(any, ReflectUtil.newInstanceIfPossible(voClass), copyOptions).copy())
- .collect(Collectors.toList());
}
}
--
Gitblit v1.9.3