From 7cf60642001238dfd1cbe522cdd842620855a59e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 27 七月 2021 11:07:33 +0800
Subject: [PATCH] update 重构 IServicePlus 功能 增加 BeanCopyUtils 深拷贝工具

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java |   92 ++++++++++++++++++++++++++++++---------------
 1 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
index 069c6a7..710f11a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
@@ -20,30 +20,38 @@
  */
 public interface IServicePlus<T, K> extends IService<T> {
 
-	K getVoById(Serializable id, CopyOptions copyOptions, Class<K> kClass);
-
-	default K getVoById(Serializable id, CopyOptions copyOptions) {
-		return getVoById(id, copyOptions, null);
-	}
+	/**
+	 * @param id          涓婚敭id
+	 * @param copyOptions copy鏉′欢
+	 * @return K瀵硅薄
+	 */
+	K getVoById(Serializable id, CopyOptions copyOptions);
 
 	default K getVoById(Serializable id) {
 		return getVoById(id, new CopyOptions());
 	}
 
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default K getVoById(Serializable id, Function<T, K> convertor) {
 		return convertor.apply(getById(id));
 	}
 
-	List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions, Class<K> kClass);
-
-	default List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
-		return listVoByIds(idList, copyOptions, null);
-	}
+	/**
+	 * @param idList      id鍒楄〃
+	 * @param copyOptions copy鏉′欢
+	 * @return K瀵硅薄
+	 */
+	List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
 
 	default List<K> listVoByIds(Collection<? extends Serializable> idList) {
 		return listVoByIds(idList, new CopyOptions());
 	}
 
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default List<K> listVoByIds(Collection<? extends Serializable> idList,
 								Function<Collection<T>, List<K>> convertor) {
 		List<T> list = getBaseMapper().selectBatchIds(idList);
@@ -53,17 +61,20 @@
 		return convertor.apply(list);
 	}
 
-	List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions, Class<K> kClass);
-
-	default List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
-		return listVoByMap(columnMap, copyOptions, null);
-	}
+	/**
+	 * @param columnMap   琛ㄥ瓧娈� map 瀵硅薄
+	 * @param copyOptions copy鏉′欢
+	 * @return K瀵硅薄
+	 */
+	List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
 
 	default List<K> listVoByMap(Map<String, Object> columnMap) {
 		return listVoByMap(columnMap, new CopyOptions());
 	}
 
-
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default List<K> listVoByMap(Map<String, Object> columnMap,
 								Function<Collection<T>, List<K>> convertor) {
 		List<T> list = getBaseMapper().selectByMap(columnMap);
@@ -73,30 +84,38 @@
 		return convertor.apply(list);
 	}
 
-	K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
-
-	default K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
-		return getVoOne(queryWrapper, copyOptions, null);
-	}
+	/**
+	 * @param queryWrapper 鏌ヨ鏉′欢
+	 * @param copyOptions  copy鏉′欢
+	 * @return K瀵硅薄
+	 */
+	K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
 
 	default K getVoOne(Wrapper<T> queryWrapper) {
 		return getVoOne(queryWrapper, new CopyOptions());
 	}
 
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default K getVoOne(Wrapper<T> queryWrapper, Function<T, K> convertor) {
 		return convertor.apply(getOne(queryWrapper, true));
 	}
 
-	List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
-
-	default List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
-		return listVo(queryWrapper, copyOptions, null);
-	}
+	/**
+	 * @param queryWrapper 鏌ヨ鏉′欢
+	 * @param copyOptions  copy鏉′欢
+	 * @return K瀵硅薄
+	 */
+	List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
 
 	default List<K> listVo(Wrapper<T> queryWrapper) {
 		return listVo(queryWrapper, new CopyOptions());
 	}
 
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default List<K> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<K>> convertor) {
 		List<T> list = getBaseMapper().selectList(queryWrapper);
 		if (list == null) {
@@ -109,20 +128,28 @@
 		return listVo(Wrappers.emptyWrapper());
 	}
 
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default List<K> listVo(Function<Collection<T>, List<K>> convertor) {
 		return listVo(Wrappers.emptyWrapper(), convertor);
 	}
 
-	PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions, Class<K> kClass);
-
-	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
-		return pageVo(page, queryWrapper, copyOptions, null);
-	}
+	/**
+	 * @param page         鍒嗛〉瀵硅薄
+	 * @param queryWrapper 鏌ヨ鏉′欢
+	 * @param copyOptions  copy鏉′欢
+	 * @return K瀵硅薄
+	 */
+	PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
 
 	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper) {
 		return pageVo(page, queryWrapper, new CopyOptions());
 	}
 
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper,
 								  Function<Collection<T>, List<K>> convertor) {
 		PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
@@ -133,6 +160,9 @@
 		return pageVo(page, Wrappers.emptyWrapper());
 	}
 
+	/**
+	 * @param convertor 鑷畾涔夎浆鎹㈠櫒
+	 */
 	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Function<Collection<T>, List<K>> convertor) {
 		return pageVo(page, Wrappers.emptyWrapper(), convertor);
 	}

--
Gitblit v1.9.3