From 92dfee02752fd6bcc5c7e45c4a8b5b6efdf57919 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 三月 2023 16:52:44 +0800
Subject: [PATCH] !315 update 优化BaseMapperPlus接口 去除 `@param <M> Mapper` 泛型(已无用处) Merge pull request !315 from Bleachtred/5.X
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java
index 68a3509..cbfe5cb 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java
@@ -9,7 +9,7 @@
import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.Db;
-import com.ruoyi.common.core.utils.BeanCopyUtils;
+import com.ruoyi.common.core.utils.MapstructUtils;
import org.apache.ibatis.logging.Log;
import org.apache.ibatis.logging.LogFactory;
@@ -24,27 +24,22 @@
/**
* 鑷畾涔� Mapper 鎺ュ彛, 瀹炵幇 鑷畾涔夋墿灞�
*
- * @param <M> mapper 娉涘瀷
* @param <T> table 娉涘瀷
* @param <V> vo 娉涘瀷
* @author Lion Li
* @since 2021-05-13
*/
@SuppressWarnings("unchecked")
-public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
+public interface BaseMapperPlus<T, V> extends BaseMapper<T> {
Log log = LogFactory.getLog(BaseMapperPlus.class);
default Class<V> currentVoClass() {
- return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 2);
+ return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 1);
}
default Class<T> currentModelClass() {
- return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 1);
- }
-
- default Class<M> currentMapperClass() {
- return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 0);
+ return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseMapperPlus.class, 0);
}
default List<T> selectList() {
@@ -112,7 +107,7 @@
if (ObjectUtil.isNull(obj)) {
return null;
}
- return BeanCopyUtils.copy(obj, voClass);
+ return MapstructUtils.convert(obj, voClass);
}
default List<V> selectVoBatchIds(Collection<? extends Serializable> idList) {
@@ -127,7 +122,7 @@
if (CollUtil.isEmpty(list)) {
return CollUtil.newArrayList();
}
- return BeanCopyUtils.copyList(list, voClass);
+ return MapstructUtils.convert(list, voClass);
}
default List<V> selectVoByMap(Map<String, Object> map) {
@@ -142,7 +137,7 @@
if (CollUtil.isEmpty(list)) {
return CollUtil.newArrayList();
}
- return BeanCopyUtils.copyList(list, voClass);
+ return MapstructUtils.convert(list, voClass);
}
default V selectVoOne(Wrapper<T> wrapper) {
@@ -157,7 +152,7 @@
if (ObjectUtil.isNull(obj)) {
return null;
}
- return BeanCopyUtils.copy(obj, voClass);
+ return MapstructUtils.convert(obj, voClass);
}
default List<V> selectVoList() {
@@ -176,7 +171,7 @@
if (CollUtil.isEmpty(list)) {
return CollUtil.newArrayList();
}
- return BeanCopyUtils.copyList(list, voClass);
+ return MapstructUtils.convert(list, voClass);
}
default <P extends IPage<V>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper) {
@@ -192,7 +187,7 @@
if (CollUtil.isEmpty(pageData.getRecords())) {
return (P) voPage;
}
- voPage.setRecords(BeanCopyUtils.copyList(pageData.getRecords(), voClass));
+ voPage.setRecords(MapstructUtils.convert(pageData.getRecords(), voClass));
return (P) voPage;
}
--
Gitblit v1.9.3