From 20e82d708b27765b77e8da54198d8dade8f54928 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 五月 2021 21:23:50 +0800
Subject: [PATCH] remove 移除 pagehelper 分页工具
---
/dev/null | 49 ------------------------
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 38 -------------------
pom.xml | 14 -------
ruoyi-common/pom.xml | 6 ---
4 files changed, 0 insertions(+), 107 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b35d5d..e5d7eb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.4</druid.version>
<knife4j.version>2.0.8</knife4j.version>
- <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
<fastjson.version>1.2.75</fastjson.version>
<oshi.version>5.6.0</oshi.version>
<jna.version>5.7.0</jna.version>
@@ -52,19 +51,6 @@
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
- </dependency>
-
- <!-- pagehelper 鍒嗛〉鎻掍欢 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- 鑾峰彇绯荤粺淇℃伅 -->
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 19f0074..a18e801 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -35,12 +35,6 @@
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
- <!-- pagehelper 鍒嗛〉鎻掍欢 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- </dependency>
-
<!-- 鑷畾涔夐獙璇佹敞瑙� -->
<dependency>
<groupId>javax.validation</groupId>
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 516d102..9b37921 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 java.beans.PropertyEditorSupport;
import java.util.Date;
-import java.util.List;
/**
* web灞傞�氱敤鏁版嵁澶勭悊
@@ -44,35 +35,6 @@
setValue(DateUtils.parseDate(text));
}
});
- }
-
- /**
- * 璁剧疆璇锋眰鍒嗛〉鏁版嵁
- */
- 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 <T> TableDataInfo<T> getDataTable(List<T> list)
- {
- TableDataInfo<T> 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 2fc6b87..0000000
--- 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;
-
- /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
- 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 14eb1e1..0000000
--- 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();
- }
-}
--
Gitblit v1.9.3