Merge remote-tracking branch 'origin/dev' into dev

zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java

@@ -8,6 +8,8 @@ import lombok.ToString;
 @Data
 @ToString
 public class DevInfoVo extends DevInfo {
+    private Integer pageNum;
+    private Integer pageSize;
     private long parentId;
     private String typeName;
     private String companyName;

zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/utils/PageUtils.java

@@ -5,6 +5,8 @@ import com.bonus.zlpt.common.core.web.page.TableSupport;
 import com.bonus.zlpt.common.core.utils.sql.SqlUtil;
 import com.github.pagehelper.PageHelper;
 
+import java.util.Objects;
+
 /**
  * 分页工具类
  * 
@@ -25,6 +27,23 @@ public class PageUtils extends PageHelper
         PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
     }
 
+    /**
+     * 设置请求分页数据
+     */
+    public static void startPage(Integer pageNum, Integer pageSize)
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        if (Objects.isNull(pageNum)) {
+            pageNum = pageDomain.getPageNum();
+        }
+        if (Objects.isNull(pageSize)) {
+            pageSize = pageDomain.getPageSize();
+        }
+        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+        Boolean reasonable = pageDomain.getReasonable();
+        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
+    }
+
     /**
      * 清理分页的线程变量
      */

zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/controller/BaseController.java

@@ -49,6 +49,11 @@ public class BaseController
         PageUtils.startPage();
     }
 
+    protected void startPage(Integer pageNum, Integer pageSize)
+    {
+        PageUtils.startPage(pageNum, pageSize);
+    }
+
     /**
      * 清理分页的线程变量
      */

zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java

@@ -36,7 +36,7 @@ public class DevInfoController extends BaseController
     @PostMapping("/list")
     public TableDataInfo list(DevInfoVo devInfo)
     {
-        startPage();
+        startPage(devInfo.getPageNum(), devInfo.getPageSize());
         List<DevInfoVo> list = devInfoService.selectDevInfoList(devInfo);
         return getDataTable(list);
     }