From 6f14c91d30f6b6fd0dd87d55b2a2cb313e2bd19e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 14 一月 2025 14:05:30 +0800
Subject: [PATCH] update 优化 !pr636 改为注解方式关闭
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
index a68d96f..24557ed 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
@@ -12,14 +12,13 @@
import org.apache.ibatis.logging.Log;
import org.apache.ibatis.logging.LogFactory;
import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 鑷畾涔� Mapper 鎺ュ彛, 瀹炵幇 鑷畾涔夋墿灞�
@@ -68,9 +67,7 @@
* @return 鎻掑叆鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean insertBatch(Collection<T> entityList) {
- Db.saveBatch(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveBatch(entityList);
}
/**
@@ -80,9 +77,7 @@
* @return 鏇存柊鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean updateBatchById(Collection<T> entityList) {
- Db.updateBatchById(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.updateBatchById(entityList);
}
/**
@@ -92,9 +87,7 @@
* @return 鎻掑叆鎴栨洿鏂版搷浣滄槸鍚︽垚鍔熺殑甯冨皵鍊�
*/
default boolean insertOrUpdateBatch(Collection<T> entityList) {
- Db.saveOrUpdateBatch(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveOrUpdateBatch(entityList);
}
/**
@@ -105,9 +98,7 @@
* @return 鎻掑叆鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean insertBatch(Collection<T> entityList, int batchSize) {
- Db.saveBatch(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveBatch(entityList, batchSize);
}
/**
@@ -118,9 +109,7 @@
* @return 鏇存柊鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean updateBatchById(Collection<T> entityList, int batchSize) {
- Db.updateBatchById(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.updateBatchById(entityList, batchSize);
}
/**
@@ -131,9 +120,7 @@
* @return 鎻掑叆鎴栨洿鏂版搷浣滄槸鍚︽垚鍔熺殑甯冨皵鍊�
*/
default boolean insertOrUpdateBatch(Collection<T> entityList, int batchSize) {
- Db.saveOrUpdateBatch(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveOrUpdateBatch(entityList, batchSize);
}
/**
@@ -168,8 +155,8 @@
* @param idList 涓婚敭ID闆嗗悎
* @return 鏌ヨ鍒扮殑VO瀵硅薄鍒楄〃
*/
- default List<V> selectVoBatchIds(Collection<? extends Serializable> idList) {
- return selectVoBatchIds(idList, this.currentVoClass());
+ default List<V> selectVoByIds(Collection<? extends Serializable> idList) {
+ return selectVoByIds(idList, this.currentVoClass());
}
/**
@@ -180,8 +167,8 @@
* @param <C> VO绫荤殑绫诲瀷
* @return 鏌ヨ鍒扮殑VO瀵硅薄鍒楄〃锛岀粡杩囪浆鎹负鎸囧畾鐨刅O绫诲悗杩斿洖
*/
- default <C> List<C> selectVoBatchIds(Collection<? extends Serializable> idList, Class<C> voClass) {
- List<T> list = this.selectBatchIds(idList);
+ default <C> List<C> selectVoByIds(Collection<? extends Serializable> idList, Class<C> voClass) {
+ List<T> list = this.selectByIds(idList);
if (CollUtil.isEmpty(list)) {
return CollUtil.newArrayList();
}
@@ -341,7 +328,7 @@
* @return 鏌ヨ鍒扮殑绗﹀悎鏉′欢鐨勫璞″垪琛紝缁忚繃杞崲涓烘寚瀹氱被鍨嬬殑瀵硅薄鍚庤繑鍥�
*/
default <C> List<C> selectObjs(Wrapper<T> wrapper, Function<? super Object, C> mapper) {
- return this.selectObjs(wrapper).stream().filter(Objects::nonNull).map(mapper).collect(Collectors.toList());
+ return StreamUtils.toList(this.selectObjs(wrapper), mapper);
}
}
--
Gitblit v1.9.3