From 293db76bd67018b40c9167eec1746c41d756d3bc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 十二月 2021 14:33:26 +0800
Subject: [PATCH] remove 移除过期代码 分页工具相关

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java |   59 +++++++++++++++--------------------------------------------
 1 files changed, 15 insertions(+), 44 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 4de5b32..740cc28 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
@@ -3,13 +3,12 @@
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.page.PagePlus;
-import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -160,81 +159,53 @@
 
 	/**
 	 * 鏍规嵁 ID 鏌ヨ
-	 *
-	 * @param id 涓婚敭ID
 	 */
 	@Override
 	public V getVoById(Serializable id) {
-		T t = getBaseMapper().selectById(id);
-		return BeanCopyUtils.copy(t, voClass);
+        return getBaseMapper().selectVoById(id, voClass);
 	}
 
 	/**
 	 * 鏌ヨ锛堟牴鎹甀D 鎵归噺鏌ヨ锛�
-	 *
-	 * @param idList 涓婚敭ID鍒楄〃
 	 */
 	@Override
 	public List<V> listVoByIds(Collection<? extends Serializable> idList) {
-		List<T> list = getBaseMapper().selectBatchIds(idList);
-		if (list == null) {
-			return null;
-		}
-		return BeanCopyUtils.copyList(list, voClass);
+        return getBaseMapper().selectVoBatchIds(idList, voClass);
 	}
 
 	/**
 	 * 鏌ヨ锛堟牴鎹� columnMap 鏉′欢锛�
-	 *
-	 * @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
 	 */
 	@Override
 	public List<V> listVoByMap(Map<String, Object> columnMap) {
-		List<T> list = getBaseMapper().selectByMap(columnMap);
-		if (list == null) {
-			return null;
-		}
-		return BeanCopyUtils.copyList(list, voClass);
+        return getBaseMapper().selectVoByMap(columnMap, voClass);
 	}
 
 	/**
 	 * 鏍规嵁 Wrapper锛屾煡璇竴鏉¤褰� <br/>
 	 * <p>缁撴灉闆嗭紝濡傛灉鏄涓細鎶涘嚭寮傚父锛岄殢鏈哄彇涓�鏉″姞涓婇檺鍒舵潯浠� wrapper.last("LIMIT 1")</p>
-	 *
-	 * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
 	 */
 	@Override
 	public V getVoOne(Wrapper<T> queryWrapper) {
-		T t = getOne(queryWrapper, true);
-		return BeanCopyUtils.copy(t, voClass);
+        return getBaseMapper().selectVoOne(queryWrapper, voClass);
 	}
 
 	/**
 	 * 鏌ヨ鍒楄〃
-	 *
-	 * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
 	 */
 	@Override
 	public List<V> listVo(Wrapper<T> queryWrapper) {
-		List<T> list = getBaseMapper().selectList(queryWrapper);
-		if (list == null) {
-			return null;
-		}
-		return BeanCopyUtils.copyList(list, voClass);
+        return getBaseMapper().selectVoList(queryWrapper, voClass);
 	}
 
-	/**
-	 * 缈婚〉鏌ヨ
-	 *
-	 * @param page         缈婚〉瀵硅薄
-	 * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
-	 */
-	@Override
-	public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
-		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
-		List<V> volist = BeanCopyUtils.copyList(result.getRecords(), voClass);
-		result.setRecordsVo(volist);
-		return result;
-	}
+    /**
+     * 缈婚〉鏌ヨ
+     *
+     * @param page         缈婚〉瀵硅薄
+     * @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
+     */
+    public <P extends IPage<V>> P pageVo(IPage<T> page, Wrapper<T> queryWrapper) {
+        return getBaseMapper().selectVoPage(page, queryWrapper, voClass);
+    }
 
 }

--
Gitblit v1.9.3