From 281b6b6d2b20522d0a444c9126c25d6bd66aaf48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 18 Jun 2021 15:25:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=20core=20mp=20?=
 =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => cache}/MybatisPlusRedisCache.java    |  2 +-
 .../core}/BaseMapperPlus.java                 |  8 ++++++-
 .../core}/IServicePlus.java                   | 21 ++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)
 rename ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/{ => cache}/MybatisPlusRedisCache.java (98%)
 rename ruoyi-common/src/main/java/com/ruoyi/common/core/{page => mybatisplus/core}/BaseMapperPlus.java (55%)
 rename ruoyi-common/src/main/java/com/ruoyi/common/core/{page => mybatisplus/core}/IServicePlus.java (93%)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/MybatisPlusRedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java
similarity index 98%
rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/MybatisPlusRedisCache.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java
index 6ff6a982..0e21d70e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/MybatisPlusRedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/cache/MybatisPlusRedisCache.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.mybatisplus;
+package com.ruoyi.common.core.mybatisplus.cache;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.ruoyi.common.core.redis.RedisCache;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/BaseMapperPlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java
similarity index 55%
rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/BaseMapperPlus.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java
index ebba1b7a..cf51c90e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/BaseMapperPlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java
@@ -1,6 +1,9 @@
-package com.ruoyi.common.core.page;
+package com.ruoyi.common.core.mybatisplus.core;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
 
 /**
  * 自定义 Mapper 接口, 实现 自定义扩展
@@ -9,4 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-05-13
  */
 public interface BaseMapperPlus<T> extends BaseMapper<T> {
+
+	int insertAll(@Param("list") Collection<T> batchList);
+
 }
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
similarity index 93%
rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
index aeaee0b5..21b0ecce 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/IServicePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
@@ -1,9 +1,10 @@
-package com.ruoyi.common.core.page;
+package com.ruoyi.common.core.mybatisplus.core;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.page.PagePlus;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -182,7 +183,6 @@ public interface IServicePlus<T> extends IService<T> {
      *
      * @param page         翻页对象
      * @param queryWrapper 实体对象封装操作类
-     * @param kClass       vo类型
      */
     default <K> PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, Class<K> kClass) {
         PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
@@ -210,7 +210,6 @@ public interface IServicePlus<T> extends IService<T> {
      * 无条件翻页查询
      *
      * @param page   翻页对象
-     * @param kClass vo类型
      */
     default <K> PagePlus<T, K> pageVo(PagePlus<T, K> page, Class<K> kClass) {
         return pageVo(page, Wrappers.emptyWrapper(), kClass);
@@ -226,5 +225,21 @@ public interface IServicePlus<T> extends IService<T> {
         return pageVo(page, Wrappers.emptyWrapper(), convertor);
     }
 
+	@Override
+	default boolean saveBatch(Collection<T> entityList) {
+		return saveBatch(entityList, DEFAULT_BATCH_SIZE);
+	}
+
+	@Override
+	default boolean saveOrUpdateBatch(Collection<T> entityList) {
+		return saveOrUpdateBatch(entityList, DEFAULT_BATCH_SIZE);
+	}
+
+	@Override
+	default boolean updateBatchById(Collection<T> entityList) {
+		return updateBatchById(entityList, DEFAULT_BATCH_SIZE);
+	}
+
+	boolean saveAll(Collection<T> entityList);
 }