From 22daef0b51625b888939bdee39f50ca07e2a5ffc Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 03 九月 2021 17:14:19 +0800 Subject: [PATCH] update 泛型统一使用 V --- ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 69 +++++++++++++++++----------------- 1 files changed, 35 insertions(+), 34 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 7ce40c7..815791b 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 @@ -15,45 +15,46 @@ /** * 鑷畾涔� 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 @@ /** * @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 @@ /** * @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 @@ 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 @@ * @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); } -- Gitblit v1.9.3