소스 검색

【CHG】不使用分页全理化

zhaomn 3 년 전
부모
커밋
1753719e81

+ 6 - 3
railway-common/src/main/java/com/railway/common/core/controller/BaseController.java

@@ -1,6 +1,5 @@
 package com.railway.common.core.controller;
 
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.railway.common.constant.HttpStatus;
@@ -16,6 +15,7 @@ import com.railway.common.utils.sql.SqlUtil;
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 
@@ -26,6 +26,9 @@ import org.springframework.web.bind.annotation.InitBinder;
  */
 public class BaseController {
 
+  @Value("${pagehelper.reasonable:false}")
+  private Boolean reasonable;
+
   /**
    * 将前台传递过来的日期格式的字符串,自动转化为Date类型
    */
@@ -45,13 +48,13 @@ public class BaseController {
    */
   protected void startPage() {
     PageDomain pageDomain = TableSupport.buildPageRequest();
+    pageDomain.setReasonable(reasonable);
     Integer pageNum = pageDomain.getPageNum();
     Integer pageSize = pageDomain.getPageSize();
     if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
       String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
       Boolean reasonable = pageDomain.getReasonable();
-      Page page = PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
-      System.out.println(page.getPageNum());
+      PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
     }
   }
 

+ 1 - 8
railway-common/src/main/java/com/railway/common/core/page/PageDomain.java

@@ -41,7 +41,7 @@ public class PageDomain {
   /**
    * 设置默认值为true时,执行分页参数合理化
    */
-  private Boolean reasonable = false;
+  private Boolean reasonable;
 
   public String getOrderBy() {
     if (StringUtils.isEmpty(orderByColumn)) {
@@ -62,11 +62,4 @@ public class PageDomain {
     }
   }
 
-  public Boolean getReasonable() {
-    if (StringUtils.isNull(reasonable)) {
-      return Boolean.FALSE;
-    }
-    return reasonable;
-  }
-
 }