From 3e5ae811bf81f567967cd25526a423bbd91cffc9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 26 八月 2021 09:24:20 +0800
Subject: [PATCH] !82 saveAll支持有id更新,无id插入 Merge pull request !82 from 抓蛙师/dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java | 81 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 37 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..99441b5 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,21 +1,24 @@
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.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
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;
import java.io.Serializable;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* IServicePlus 瀹炵幇绫�
@@ -95,6 +98,10 @@
return super.updateBatchById(entityList, batchSize);
}
+ /**
+ * 鍗晄ql鎵归噺鎻掑叆( 鍏ㄩ噺濉厖 鏃犺鏁版嵁搴撻粯璁ゅ�� )
+ * 閫傜敤浜庢棤鑴戞彃鍏�
+ */
@Override
public boolean saveBatch(Collection<T> entityList) {
return saveBatch(entityList, DEFAULT_BATCH_SIZE);
@@ -111,12 +118,32 @@
}
/**
- * 鍗晄ql鎵归噺鎻掑叆( 鍏ㄩ噺濉厖 鏃犺鏁版嵁搴撻粯璁ゅ�� )
+ * 鍗晄ql鎵归噺鎻掑叆( 鍏ㄩ噺濉厖 )
* 閫傜敤浜庢棤鑴戞彃鍏�
*/
@Override
public boolean saveAll(Collection<T> entityList) {
- return baseMapper.insertAll(entityList) == entityList.size();
+ ArrayList<T> list = new ArrayList<>();
+ for (T t : entityList) {
+ try {
+ //鑾峰彇灞炴�ф敞瑙ｇ殑value鍊�
+ Field f = t.getClass().getDeclaredField("id");
+ f.setAccessible( true );//璁剧疆鍙互鑼冨洿private
+ Object o = f.get(t);//鑾峰彇鍑篿d鐨勫��
+ System.out.println(o);
+ if (o == null) {
+ //濡傛灉id涓簄ull,鎻掑叆
+ list.add(t);
+ } else {
+ //鍚﹀垯鏇存柊
+ baseMapper.updateById(t);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return baseMapper.insertAll(list) == list.size();
}
/**
@@ -125,9 +152,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 +163,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 +177,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 +192,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 +203,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 +218,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