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