疯狂的狮子li
2021-12-28 293db76bd67018b40c9167eec1746c41d756d3bc
remove 移除过期代码 分页工具相关
已修改2个文件
已删除2个文件
405 ■■■■■ 文件已修改
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java 158 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java 193 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java
@@ -1,10 +1,8 @@
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;
import java.io.Serializable;
import java.util.Collection;
@@ -109,43 +107,6 @@
     */
    default List<V> listVo(Function<Collection<T>, List<V>> convertor) {
        return listVo(Wrappers.emptyWrapper(), convertor);
    }
    /**
     * @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 è‡ªå®šä¹‰è½¬æ¢å™¨
     * @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);
    }
    boolean saveAll(Collection<T> entityList);
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
@@ -9,8 +9,6 @@
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -198,19 +196,6 @@
    @Override
    public List<V> listVo(Wrapper<T> queryWrapper) {
        return getBaseMapper().selectVoList(queryWrapper, voClass);
    }
    /**
     * ç¿»é¡µæŸ¥è¯¢
     * @deprecated 3.6.0 ç§»é™¤ è¯·ä½¿ç”¨ {@link #pageVo(IPage, Wrapper)}
     */
    @Override
    @Deprecated
    public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper) {
        PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
        List<V> volist = BeanCopyUtils.copyList(result.getRecords(), voClass);
        result.setRecordsVo(volist);
        return result;
    }
    /**
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
ÎļþÒÑɾ³ý
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ÎļþÒÑɾ³ý