update 泛型统一使用 V

ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java

@@ -15,45 +15,46 @@ import java.util.function.Function;
 /**
  * 自定义 Service 接口, 实现 数据库实体与 vo 对象转换返回
  *
+ * @param <T> 数据实体类
+ * @param <V> vo类
  * @author Lion Li
- * @since 2021-05-13
  */
-public interface IServicePlus<T, K> extends IService<T> {
+public interface IServicePlus<T, V> extends IService<T> {
 
 	/**
 	 * @param id          主键id
 	 * @param copyOptions copy条件
-	 * @return K对象
+	 * @return V对象
 	 */
-	K getVoById(Serializable id, CopyOptions copyOptions);
+	V getVoById(Serializable id, CopyOptions copyOptions);
 
-	default K getVoById(Serializable id) {
+	default V getVoById(Serializable id) {
 		return getVoById(id, new CopyOptions());
 	}
 
 	/**
 	 * @param convertor 自定义转换器
 	 */
-	default K getVoById(Serializable id, Function<T, K> convertor) {
+	default V getVoById(Serializable id, Function<T, V> convertor) {
 		return convertor.apply(getById(id));
 	}
 
 	/**
 	 * @param idList      id列表
 	 * @param copyOptions copy条件
-	 * @return K对象
+	 * @return V对象
 	 */
-	List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
+	List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions);
 
-	default List<K> listVoByIds(Collection<? extends Serializable> idList) {
+	default List<V> 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) {
+	default List<V> listVoByIds(Collection<? extends Serializable> idList,
+								Function<Collection<T>, List<V>> convertor) {
 		List<T> list = getBaseMapper().selectBatchIds(idList);
 		if (list == null) {
 			return null;
@@ -64,19 +65,19 @@ public interface IServicePlus<T, K> extends IService<T> {
 	/**
 	 * @param columnMap   表字段 map 对象
 	 * @param copyOptions copy条件
-	 * @return K对象
+	 * @return V对象
 	 */
-	List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
+	List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions);
 
-	default List<K> listVoByMap(Map<String, Object> columnMap) {
+	default List<V> 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) {
+	default List<V> listVoByMap(Map<String, Object> columnMap,
+								Function<Collection<T>, List<V>> convertor) {
 		List<T> list = getBaseMapper().selectByMap(columnMap);
 		if (list == null) {
 			return null;
@@ -87,36 +88,36 @@ public interface IServicePlus<T, K> extends IService<T> {
 	/**
 	 * @param queryWrapper 查询条件
 	 * @param copyOptions  copy条件
-	 * @return K对象
+	 * @return V对象
 	 */
-	K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions);
 
-	default K getVoOne(Wrapper<T> queryWrapper) {
+	default V getVoOne(Wrapper<T> queryWrapper) {
 		return getVoOne(queryWrapper, new CopyOptions());
 	}
 
 	/**
 	 * @param convertor 自定义转换器
 	 */
-	default K getVoOne(Wrapper<T> queryWrapper, Function<T, K> convertor) {
+	default V getVoOne(Wrapper<T> queryWrapper, Function<T, V> convertor) {
 		return convertor.apply(getOne(queryWrapper, true));
 	}
 
 	/**
 	 * @param queryWrapper 查询条件
 	 * @param copyOptions  copy条件
-	 * @return K对象
+	 * @return V对象
 	 */
-	List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions);
 
-	default List<K> listVo(Wrapper<T> queryWrapper) {
+	default List<V> listVo(Wrapper<T> queryWrapper) {
 		return listVo(queryWrapper, new CopyOptions());
 	}
 
 	/**
 	 * @param convertor 自定义转换器
 	 */
-	default List<K> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<K>> convertor) {
+	default List<V> listVo(Wrapper<T> queryWrapper, Function<Collection<T>, List<V>> convertor) {
 		List<T> list = getBaseMapper().selectList(queryWrapper);
 		if (list == null) {
 			return null;
@@ -124,14 +125,14 @@ public interface IServicePlus<T, K> extends IService<T> {
 		return convertor.apply(list);
 	}
 
-	default List<K> listVo() {
+	default List<V> listVo() {
 		return listVo(Wrappers.emptyWrapper());
 	}
 
 	/**
 	 * @param convertor 自定义转换器
 	 */
-	default List<K> listVo(Function<Collection<T>, List<K>> convertor) {
+	default List<V> listVo(Function<Collection<T>, List<V>> convertor) {
 		return listVo(Wrappers.emptyWrapper(), convertor);
 	}
 
@@ -139,31 +140,31 @@ public interface IServicePlus<T, K> extends IService<T> {
 	 * @param page         分页对象
 	 * @param queryWrapper 查询条件
 	 * @param copyOptions  copy条件
-	 * @return K对象
+	 * @return V对象
 	 */
-	PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
+	PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions);
 
-	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper) {
+	default PagePlus<T, V> pageVo(PagePlus<T, V> 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);
+	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper,
+								  Function<Collection<T>, List<V>> convertor) {
+		PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
 		return result.setRecordsVo(convertor.apply(result.getRecords()));
 	}
 
-	default PagePlus<T, K> pageVo(PagePlus<T, K> page) {
+	default PagePlus<T, V> pageVo(PagePlus<T, V> page) {
 		return pageVo(page, Wrappers.emptyWrapper());
 	}
 
 	/**
 	 * @param convertor 自定义转换器
 	 */
-	default PagePlus<T, K> pageVo(PagePlus<T, K> page, Function<Collection<T>, List<K>> convertor) {
+	default PagePlus<T, V> pageVo(PagePlus<T, V> page, Function<Collection<T>, List<V>> convertor) {
 		return pageVo(page, Wrappers.emptyWrapper(), convertor);
 	}