diff --git a/pom.xml b/pom.xml
index 4b35d5d3..e5d7eb37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
3.1.1
1.2.4
2.0.8
- 1.3.0
1.2.75
5.6.0
5.7.0
@@ -54,19 +53,6 @@
${druid.version}
-
-
- com.github.pagehelper
- pagehelper-spring-boot-starter
- ${pagehelper.boot.version}
-
-
- org.mybatis
- mybatis
-
-
-
-
com.github.oshi
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 19f00745..a18e8013 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -35,12 +35,6 @@
spring-boot-starter-security
-
-
- com.github.pagehelper
- pagehelper-spring-boot-starter
-
-
javax.validation
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 516d1023..9b379217 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -1,16 +1,8 @@
package com.ruoyi.common.core.controller;
-import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpStatus;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.sql.SqlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@@ -18,7 +10,6 @@ import org.springframework.web.bind.annotation.InitBinder;
import java.beans.PropertyEditorSupport;
import java.util.Date;
-import java.util.List;
/**
* web层通用数据处理
@@ -46,35 +37,6 @@ public class BaseController
});
}
- /**
- * 设置请求分页数据
- */
- protected void startPage()
- {
- PageDomain pageDomain = TableSupport.buildPageRequest();
- Integer pageNum = pageDomain.getPageNum();
- Integer pageSize = pageDomain.getPageSize();
- if (Validator.isNotNull(pageNum) && Validator.isNotNull(pageSize))
- {
- String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
- PageHelper.startPage(pageNum, pageSize, orderBy);
- }
- }
-
- /**
- * 响应请求分页数据
- */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- protected TableDataInfo getDataTable(List list)
- {
- TableDataInfo rspData = new TableDataInfo();
- rspData.setCode(HttpStatus.HTTP_OK);
- rspData.setMsg("查询成功");
- rspData.setRows(list);
- rspData.setTotal(new PageInfo(list).getTotal());
- return rspData;
- }
-
/**
* 响应返回结果
*
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
deleted file mode 100644
index 2fc6b875..00000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.common.core.page;
-
-import cn.hutool.core.util.StrUtil;
-import lombok.*;
-import lombok.experimental.Accessors;
-
-/**
- * 分页数据
- *
- * @author ruoyi
- */
-
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class PageDomain
-{
- /** 当前记录起始索引 */
- private Integer pageNum;
-
- /** 每页显示记录数 */
- private Integer pageSize;
-
- /** 排序列 */
- private String orderByColumn;
-
- /** 排序的方向desc或者asc */
- private String isAsc = "asc";
-
- public String getOrderBy()
- {
- if (StrUtil.isEmpty(orderByColumn))
- {
- return "";
- }
- return StrUtil.toUnderlineCase(orderByColumn) + " " + isAsc;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
deleted file mode 100644
index 14eb1e11..00000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ruoyi.common.core.page;
-
-import com.ruoyi.common.utils.ServletUtils;
-
-/**
- * 表格数据处理
- *
- * @author ruoyi
- */
-public class TableSupport
-{
- /**
- * 当前记录起始索引
- */
- public static final String PAGE_NUM = "pageNum";
-
- /**
- * 每页显示记录数
- */
- public static final String PAGE_SIZE = "pageSize";
-
- /**
- * 排序列
- */
- public static final String ORDER_BY_COLUMN = "orderByColumn";
-
- /**
- * 排序的方向 "desc" 或者 "asc".
- */
- public static final String IS_ASC = "isAsc";
-
- /**
- * 封装分页对象
- */
- public static PageDomain getPageDomain()
- {
- PageDomain pageDomain = new PageDomain();
- pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
- pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
- pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
- pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
- return pageDomain;
- }
-
- public static PageDomain buildPageRequest()
- {
- return getPageDomain();
- }
-}