From 44bc7dd9a5360de59cbfdfeca55787afdb27b14b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 16 十二月 2021 00:11:38 +0800 Subject: [PATCH] update 修改已过期方法 调整编译警告 --- ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 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 6b373ff..e645562 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 @@ -1,6 +1,7 @@ package com.ruoyi.common.core.mybatisplus.core; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.PagePlus; @@ -114,25 +115,35 @@ * @param page 鍒嗛〉瀵硅薄 * @param queryWrapper 鏌ヨ鏉′欢 * @return V瀵硅薄 + * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)} */ + @Deprecated PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper); - /** - * @param convertor 鑷畾涔夎浆鎹㈠櫒 - */ + /** + * @param convertor 鑷畾涔夎浆鎹㈠櫒 + * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)} + */ + @Deprecated 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())); } + /** + * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)} + */ + @Deprecated default PagePlus<T, V> pageVo(PagePlus<T, V> page) { return pageVo(page, Wrappers.emptyWrapper()); } /** * @param convertor 鑷畾涔夎浆鎹㈠櫒 + * @deprecated 3.6.0 绉婚櫎 璇蜂娇鐢� {@link ServicePlusImpl#pageVo(IPage, Wrapper)} */ + @Deprecated 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