From 545f0bd4b0b2f84fb54c165bc551aa08ca9c073e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Wed, 25 Aug 2021 20:24:35 +0800
Subject: [PATCH] =?UTF-8?q?saveAll=E6=94=AF=E6=8C=81=E6=9C=89id=E5=88=99?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=92=8C=E6=97=A0id=E5=88=99=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisplus/core/ServicePlusImpl.java     | 27 ++++++++++++++++++-
 .../demo/controller/TestBatchController.java  |  9 +++++--
 2 files changed, 33 insertions(+), 3 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 90a1bd4e7..99441b5d2 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,8 @@
 package com.ruoyi.common.core.mybatisplus.core;
 
 import cn.hutool.core.bean.copier.CopyOptions;
+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;
@@ -11,6 +13,9 @@ 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;
@@ -118,7 +123,27 @@ public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceI
 	 */
 	@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);//获取出id的值
+				System.out.println(o);
+				if (o == null) {
+					//如果id为null,插入
+					list.add(t);
+				} else {
+					//否则更新
+					baseMapper.updateById(t);
+				}
+
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return baseMapper.insertAll(list) == list.size();
 	}
 
 	/**
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
index f3a7f6d01..db96797cf 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
@@ -39,8 +39,13 @@ public class TestBatchController extends BaseController {
 //	@DataSource(DataSourceType.SLAVE)
     public AjaxResult<Void> add() {
 		List<TestDemo> list = new ArrayList<>();
-		for (int i = 0; i < 1000; i++) {
-			list.add(new TestDemo().setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
+		for (int i = 0; i < 10; i++) {
+			TestDemo testDemo = new TestDemo();
+			if (i % 2 == 0) {
+				list.add(testDemo.setId((long) i + 1).setTestKey("批量更新").setValue("批量更新"));
+			} else {
+				list.add(testDemo.setOrderNum(-1L).setTestKey("批量新增").setValue("测试新增"));
+			}
 		}
         return toAjax(iTestDemoService.saveAll(list) ? 1 : 0);
     }