1、分页pageNum调整为page

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/page/PageHelperUtil.java

@@ -34,7 +34,7 @@ public class PageHelperUtil {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static PageResult findPage(PageRequest pageRequest, Object mapper, String queryMethodName, Object... args) {
         // 设置分页参数
-        int pageNum = pageRequest.getPageNum();
+        int pageNum = pageRequest.getPage();
         int pageSize = pageRequest.getPageSize();
         PageHelper.startPage(pageNum, pageSize);
         // 利用反射调用查询方法
@@ -59,7 +59,7 @@ public class PageHelperUtil {
 
     public static PageResult setPageResult(PageInfo<?> pageInfo){
         PageResult pageResult = new PageResult();
-        pageResult.setPageNum(pageInfo.getPageNum());
+        pageResult.setPage(pageInfo.getPageNum());
         pageResult.setPageSize(pageInfo.getPageSize());
         pageResult.setSize(pageInfo.getTotal());
         pageResult.setPages(pageInfo.getPages());

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/page/PageRequest.java

@@ -1,30 +1,21 @@
 package com.sckw.core.model.page;
 
+import lombok.Data;
+
 /**
  * 分页请求
  * @author zk
  * @date Nov 24, 2018
  */
+@Data
 public class PageRequest {
 	/**
 	 * 当前页码
 	 */
-	private int pageNum = 1;
+	private int page = 1;
 	/**
 	 * 每页数量
 	 */
 	private int pageSize = 10;
 
-	public int getPageNum() {
-		return pageNum;
-	}
-	public void setPageNum(int pageNum) {
-		this.pageNum = pageNum;
-	}
-	public int getPageSize() {
-		return pageSize;
-	}
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
 }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/page/PageResult.java

@@ -15,7 +15,7 @@ public class PageResult {
     /**
      * 当前页数
      */
-    protected int pageNum;
+    protected int page;
     /**
      * 每页显示条数
      */
@@ -34,20 +34,20 @@ public class PageResult {
 
     }
 
-    public PageResult(int pageNum, int pageSize, List list){
-        this.pageNum = pageNum;
+    public PageResult(int page, int pageSize, List list){
+        this.page = page;
         this.pageSize = pageSize;
         if(list == null){
             this.size = 0;
             this.list = null;
         }else{
             this.size = list.size();
-            this.list = list.subList(pageSize * (pageNum - 1),pageSize * pageNum > size ? (int) size : pageSize * pageNum);
+            this.list = list.subList(pageSize * (page - 1),pageSize * page > size ? (int) size : pageSize * page);
         }
     }
 
-    public PageResult(int pageNum, int pageSize, List list, int size){
-        this.pageNum = pageNum;
+    public PageResult(int page, int pageSize, List list, int size){
+        this.page = page;
         this.pageSize = pageSize;
         if(list == null){
             this.size = 0;
@@ -59,7 +59,7 @@ public class PageResult {
     }
 
     public PageResult(PageInfo pageInfo){
-        this.pageNum = pageInfo.getPageNum();
+        this.page = pageInfo.getPageNum();
         this.pageSize = pageInfo.getPageSize();
         this.size = pageInfo.getTotal();
         this.pages = pageInfo.getPages();
@@ -67,19 +67,19 @@ public class PageResult {
     }
 
     public void setPageInfo(PageInfo pageInfo){
-        this.pageNum = pageInfo.getPageNum();
+        this.page = pageInfo.getPageNum();
         this.pageSize = pageInfo.getPageSize();
         this.size = pageInfo.getTotal();
         this.pages = pageInfo.getPages();
         this.list = pageInfo.getList();
     }
 
-    public int getPageNum() {
-        return pageNum;
+    public int getPage() {
+        return page;
     }
 
-    public void setPageNum(int pageNum) {
-        this.pageNum = pageNum;
+    public void setPage(int page) {
+        this.page = page;
     }
 
     public int getPageSize() {
@@ -114,8 +114,8 @@ public class PageResult {
         this.list = list;
     }
 
-    public static int getPageNum(Map record) {
-        return record != null && record.get("pageNum") != null ? Integer.parseInt(record.get("pageNum").toString()) : 1;
+    public static int getPage(Map record) {
+        return record != null && record.get("page") != null ? Integer.parseInt(record.get("page").toString()) : 1;
     }
 
     public static int getPageSize(Map record) {

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/CollectionUtils.java

@@ -218,7 +218,7 @@ public class CollectionUtils extends CollectionUtil {
 	 * @param pageSize 每页多少条数据
 	 * @return
 	 */
-	public static List startPage(List list, Integer pageNum,
+	public static List startPage(List list, Integer page,
 								 Integer pageSize) {
 		if (list == null) {
 			return null;
@@ -227,7 +227,7 @@ public class CollectionUtils extends CollectionUtil {
 			return null;
 		}
 		Integer count = list.size(); // 记录总数
-		int fromIndex = Math.min((pageNum - 1) * pageSize,count);
+		int fromIndex = Math.min((page - 1) * pageSize,count);
 		int toIndex = Math.min(fromIndex + pageSize,count);
 
 		List pageList = list.subList(fromIndex, toIndex);

sckw-gateway/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
 

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/MessageController.java

@@ -52,7 +52,7 @@ public class MessageController {
      */
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult select(@RequestBody @Valid SelectMessagesReqVO params) {
-        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        PageHelper.startPage(params.getPage(), params.getPageSize());
         List<KwmMessage> list = messageService.select(params);
         PageResult result = PageHelperUtil.getPageResult(new PageInfo<>(list));
         return HttpResult.ok(result);

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsRoleController.java

@@ -41,7 +41,7 @@ public class KwsRoleController {
     }
 
     /**
-     * @param params {pageNum：页数、pageSize：每页条数、。。。}
+     * @param params {page：页数、pageSize：每页条数、。。。}
      * @return
      * @description 分页查询
      * @author zk
@@ -50,7 +50,7 @@ public class KwsRoleController {
     @PostMapping("/select")
     public HttpResult select(@RequestBody HashMap params) throws SystemException {
         // 设置分页参数
-        PageHelper.startPage(PageResult.getPageNum(params), PageResult.getPageSize(params));
+        PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
         List<KwsRole> list = kwsRoleService.findPage(params);
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
         return HttpResult.ok(pageResult);

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -40,7 +40,7 @@ public class KwsUserController {
     }
 
     /**
-     * @param params {pageNum：页数、pageSize：每页条数、。。。}
+     * @param params {page：页数、pageSize：每页条数、。。。}
      * @description 分页查询
      * @author zk
      * @date 2023/5/30
@@ -48,14 +48,14 @@ public class KwsUserController {
     @PostMapping("/select")
     public HttpResult findPage(@RequestBody HashMap params) throws SystemException {
         // 设置分页参数
-        PageHelper.startPage(PageResult.getPageNum(params), PageResult.getPageSize(params));
+        PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
         List<KwsUser> list = kwsUserService.findPage(params);
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
         return HttpResult.ok(pageResult);
     }
 
     /**
-     * @param params {pageNum：页数、pageSize：每页条数、。。。}
+     * @param params {page：页数、pageSize：每页条数、。。。}
      * @description 分页查询
      * @author zk
      * @date 2023/5/30

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/SysDictController.java

@@ -60,7 +60,7 @@ public class SysDictController {
     @PostMapping("/select")
     public HttpResult findPage(@RequestBody HashMap params) throws Exception {
         // 设置分页参数
-        PageHelper.startPage(PageResult.getPageNum(params), PageResult.getPageSize(params));
+        PageHelper.startPage(PageResult.getPage(params), PageResult.getPageSize(params));
         List<SysDict> list = sysDictService.findPage(params);
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo(list));
         return HttpResult.ok(pageResult);

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -234,7 +234,7 @@ public class KwsEnterpriseService {
      * @date: 2023/6/9
      */
     public PageResult findPage(EntFindPageReqVo reqVo) throws SystemException {
-        PageHelper.startPage(reqVo.getPageNum(), reqVo.getPageSize());
+        PageHelper.startPage(reqVo.getPage(), reqVo.getPageSize());
         List<KwsEnterprise> list = findList(reqVo);
         return PageHelperUtil.getPageResult(new PageInfo<>(list));
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -38,7 +38,7 @@ public class AcceptCarriageOrderService {
         acceptCarriageOrderVo.setCarWaybillList(carWaybillVoList);
         acceptCarriageOrderVo.setConsignmentList(consignmentVos);
         list.add(acceptCarriageOrderVo);
-        PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        PageHelper.startPage(query.getPage(), query.getPageSize());
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
         Map<String,Object> map=new HashMap<>();
         map.put("data",pageResult);