From 293db76bd67018b40c9167eec1746c41d756d3bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Tue, 28 Dec 2021 14:33:26 +0800 Subject: [PATCH] =?UTF-8?q?remove=20=E7=A7=BB=E9=99=A4=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E5=88=86=E9=A1=B5=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mybatisplus/core/IServicePlus.java | 39 ---- .../mybatisplus/core/ServicePlusImpl.java | 15 -- .../com/ruoyi/common/core/page/PagePlus.java | 158 -------------- .../com/ruoyi/common/utils/PageUtils.java | 193 ------------------ 4 files changed, 405 deletions(-) delete mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java delete mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java 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 e645562a5..f45a14ef9 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,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; @@ -111,43 +109,6 @@ public interface IServicePlus extends IService { return listVo(Wrappers.emptyWrapper(), convertor); } - /** - * @param page 分页对象 - * @param queryWrapper 查询条件 - * @return V对象 - * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)} - */ - @Deprecated - PagePlus pageVo(PagePlus page, Wrapper queryWrapper); - - /** - * @param convertor 自定义转换器 - * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)} - */ - @Deprecated - default PagePlus pageVo(PagePlus page, Wrapper queryWrapper, - Function, List> convertor) { - PagePlus result = getBaseMapper().selectPage(page, queryWrapper); - return result.setRecordsVo(convertor.apply(result.getRecords())); - } - - /** - * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)} - */ - @Deprecated - default PagePlus pageVo(PagePlus page) { - return pageVo(page, Wrappers.emptyWrapper()); - } - - /** - * @param convertor 自定义转换器 - * @deprecated 3.6.0 移除 请使用 {@link ServicePlusImpl#pageVo(IPage, Wrapper)} - */ - @Deprecated - default PagePlus pageVo(PagePlus page, Function, List> convertor) { - return pageVo(page, Wrappers.emptyWrapper(), convertor); - } - boolean saveAll(Collection entityList); boolean saveOrUpdateAll(Collection entityList); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java index 0650cfa97..740cc2885 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java @@ -9,8 +9,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; 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; @@ -200,19 +198,6 @@ public class ServicePlusImpl, T, V> extends ServiceI return getBaseMapper().selectVoList(queryWrapper, voClass); } - /** - * 翻页查询 - * @deprecated 3.6.0 移除 请使用 {@link #pageVo(IPage, Wrapper)} - */ - @Override - @Deprecated - public PagePlus pageVo(PagePlus page, Wrapper queryWrapper) { - PagePlus result = getBaseMapper().selectPage(page, queryWrapper); - List volist = BeanCopyUtils.copyList(result.getRecords(), voClass); - result.setRecordsVo(volist); - return result; - } - /** * 翻页查询 * diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java deleted file mode 100644 index bff381c40..000000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.ruoyi.common.core.page; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -/** - * 分页 Page 增强对象 - * - * @param 数据库实体 - * @param vo实体 - * @author Lion Li - * @deprecated 3.6.0 删除 请使用 {@link com.ruoyi.common.core.domain.PageQuery#build()} - */ -@Data -@Accessors(chain = true) -@Deprecated -public class PagePlus implements IPage { - - /** - * domain实体列表 - */ - private List records = Collections.emptyList(); - - /** - * vo实体列表 - */ - private List recordsVo = Collections.emptyList(); - - /** - * 总数 - */ - private long total = 0L; - - /** - * 页长度 - */ - private long size = 10L; - - /** - * 当前页 - */ - private long current = 1L; - - /** - * 排序字段信息 - */ - private List orders = new ArrayList<>(); - - /** - * 自动优化 COUNT SQL - */ - private boolean optimizeCountSql = true; - - /** - * 是否进行 count 查询 - */ - private boolean isSearchCount = true; - - /** - * 是否命中count缓存 - */ - private boolean hitCount = false; - - /** - * countId - */ - private String countId; - - /** - * 最大limit - */ - private Long maxLimit; - - public PagePlus() { - } - - public PagePlus(long current, long size) { - this(current, size, 0L); - } - - public PagePlus(long current, long size, long total) { - this(current, size, total, true); - } - - public PagePlus(long current, long size, boolean isSearchCount) { - this(current, size, 0L, isSearchCount); - } - - public PagePlus(long current, long size, long total, boolean isSearchCount) { - if (current > 1L) { - this.current = current; - } - this.size = size; - this.total = total; - this.isSearchCount = isSearchCount; - } - - @Override - public String countId() { - return this.getCountId(); - } - - @Override - public Long maxLimit() { - return this.getMaxLimit(); - } - - public PagePlus addOrder(OrderItem... items) { - this.orders.addAll(Arrays.asList(items)); - return this; - } - - public PagePlus addOrder(List items) { - this.orders.addAll(items); - return this; - } - - @Override - public List orders() { - return this.getOrders(); - } - - @Override - public boolean optimizeCountSql() { - return this.optimizeCountSql; - } - - @Override - public long getPages() { - // 解决 github issues/3208 - return IPage.super.getPages(); - } - - public static PagePlus of(long current, long size) { - return of(current, size, 0); - } - - public static PagePlus of(long current, long size, long total) { - return of(current, size, total, true); - } - - public static PagePlus of(long current, long size, boolean searchCount) { - return of(current, size, 0, searchCount); - } - - public static PagePlus of(long current, long size, long total, boolean searchCount) { - return new PagePlus<>(current, size, total, searchCount); - } - -} - diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java deleted file mode 100644 index 5042de401..000000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.ruoyi.common.utils; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpStatus; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.PagePlus; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.sql.SqlUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * 分页工具 - * - * @author Lion Li - * @deprecated 3.6.0 删除 请使用 {@link PageQuery} 与 {@link TableDataInfo} - */ -@Deprecated -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class PageUtils { - - /** - * 当前记录起始索引 - */ - @Deprecated - public static final String PAGE_NUM = "pageNum"; - - /** - * 每页显示记录数 - */ - @Deprecated - public static final String PAGE_SIZE = "pageSize"; - - /** - * 排序列 - */ - @Deprecated - public static final String ORDER_BY_COLUMN = "orderByColumn"; - - /** - * 排序的方向 "desc" 或者 "asc". - */ - @Deprecated - public static final String IS_ASC = "isAsc"; - - /** - * 当前记录起始索引 默认值 - */ - @Deprecated - public static final int DEFAULT_PAGE_NUM = 1; - - /** - * 每页显示记录数 默认值 默认查全部 - */ - @Deprecated - public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; - - /** - * 构建 plus 分页对象 - * - * @param domain 实体 - * @param vo 实体 - * @return 分页对象 - * @deprecated 3.6.0 删除 请使用 {@link PageQuery#build()} - * 由于使用 Servlet 获取只能从 param 获取 灵活性降低 故将传参操作交给用户 - */ - @Deprecated - public static PagePlus buildPagePlus() { - Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM); - Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE); - String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN); - String isAsc = ServletUtils.getParameter(IS_ASC); - if (pageNum <= 0) { - pageNum = DEFAULT_PAGE_NUM; - } - PagePlus page = new PagePlus<>(pageNum, pageSize); - OrderItem orderItem = buildOrderItem(orderByColumn, isAsc); - if (ObjectUtil.isNotNull(orderItem)) { - page.addOrder(orderItem); - } - return page; - } - - @Deprecated - public static Page buildPage() { - return buildPage(null, null); - } - - /** - * 构建 MP 普通分页对象 - * - * @param domain 实体 - * @return 分页对象 - * @deprecated 3.6.0 删除 请使用 {@link PageQuery#build()} - * 由于使用 Servlet 获取只能从 param 获取 灵活性降低 故将传参操作交给用户 - */ - @Deprecated - public static Page buildPage(String defaultOrderByColumn, String defaultIsAsc) { - Integer pageNum = ServletUtils.getParameterToInt(PAGE_NUM, DEFAULT_PAGE_NUM); - Integer pageSize = ServletUtils.getParameterToInt(PAGE_SIZE, DEFAULT_PAGE_SIZE); - String orderByColumn = ServletUtils.getParameter(ORDER_BY_COLUMN, defaultOrderByColumn); - String isAsc = ServletUtils.getParameter(IS_ASC, defaultIsAsc); - if (pageNum <= 0) { - pageNum = DEFAULT_PAGE_NUM; - } - Page page = new Page<>(pageNum, pageSize); - OrderItem orderItem = buildOrderItem(orderByColumn, isAsc); - if (ObjectUtil.isNotNull(orderItem)) { - page.addOrder(orderItem); - } - return page; - } - - private static OrderItem buildOrderItem(String orderByColumn, String isAsc) { - // 兼容前端排序类型 - if ("ascending".equals(isAsc)) { - isAsc = "asc"; - } else if ("descending".equals(isAsc)) { - isAsc = "desc"; - } - if (StringUtils.isNotBlank(orderByColumn)) { - String orderBy = SqlUtil.escapeOrderBySql(orderByColumn); - orderBy = StringUtils.toUnderScoreCase(orderBy); - if ("asc".equals(isAsc)) { - return OrderItem.asc(orderBy); - } else if ("desc".equals(isAsc)) { - return OrderItem.desc(orderBy); - } - } - return null; - } - - /** - * 构建 MP 普通分页对象 - * - * @param domain 实体 - * @return 分页对象 - * @deprecated 3.6.0 删除 请使用 {@link PageQuery#build()} - * 由于使用 Servlet 获取只能从 param 获取 灵活性降低 故将传参操作交给用户 - */ - @Deprecated - public static TableDataInfo buildDataInfo(PagePlus page) { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - rspData.setRows(page.getRecordsVo()); - rspData.setTotal(page.getTotal()); - return rspData; - } - - /** - * @deprecated 3.6.0 删除 请使用 {@link TableDataInfo#build(IPage)} - */ - @Deprecated - public static TableDataInfo buildDataInfo(Page page) { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - rspData.setRows(page.getRecords()); - rspData.setTotal(page.getTotal()); - return rspData; - } - - /** - * @deprecated 3.6.0 删除 请使用 {@link TableDataInfo#build(List)} - */ - @Deprecated - public static TableDataInfo buildDataInfo(List list) { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - rspData.setRows(list); - rspData.setTotal(list.size()); - return rspData; - } - - /** - * @deprecated 3.6.0 删除 请使用 {@link TableDataInfo#build()} - */ - @Deprecated - public static TableDataInfo buildDataInfo() { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - return rspData; - } - -}