From 1f87207e65a1729ee9e06bfd042cb8779ff85bb4 Mon Sep 17 00:00:00 2001
From: tianliyong <tianliyong@axzo.cn>
Date: Fri, 14 Jul 2023 21:39:13 +0800
Subject: [PATCH] =?UTF-8?q?ApiPageResult=E4=BC=98=E5=8C=96=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/web/result/ApiPageResult.java      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java
index eee1e5e..970241a 100644
--- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java
+++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java
@@ -3,11 +3,9 @@ package cn.axzo.framework.domain.web.result;
 import cn.axzo.framework.domain.page.*;
 import cn.axzo.framework.domain.web.code.IRespCode;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import java.beans.ConstructorProperties;
@@ -23,9 +21,8 @@ import static com.google.common.collect.Lists.newArrayList;
  * @Author liyong.tian
  * @Date 2020/9/7 20:32
  **/
-@Data
+@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@JsonPropertyOrder({"code", "msg", "data"})
 public class ApiPageResult<E> extends ApiCoreResult<PageData<E>>{
 
     public static <E> ApiPageResult<E> empty() {
@@ -107,18 +104,19 @@ public class ApiPageResult<E> extends ApiCoreResult<PageData<E>>{
 
     public static <E> ApiPageResult<E> build(Long total, Integer code, String message, List<E> data,
         Integer pageNum, Integer pageSize) {
-        return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, null);
+        PageData<E> pageData = new PageData<>(data, total, pageNum, pageSize);
+        return new ApiPageResult<>(code, message, pageData);
     }
 
     public static <E> ApiPageResult<E> build(Long total, Integer code, String message, List<E> data,
         Integer pageNum, Integer pageSize, PageVerbose verbose) {
-        return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, verbose);
+        PageData<E> pageData = new PageData<>(data, total, pageNum, pageSize);
+        return new ApiPageResult<>(code, message, pageData);
     }
 
-    @ConstructorProperties({"total", "code", "message", "data", "pageNum", "pageSize", "verbose"})
-    public ApiPageResult(Long total, Integer code, String message, List<E> data, Integer pageNum, Integer pageSize,
-                         PageVerbose verbose) {
-        super(code, message, new PageData<>(data, total, pageNum, pageSize));
+    @ConstructorProperties({"code", "msg", "data"})
+    public ApiPageResult(Integer code, String message, PageData<E> data) {
+        super(code, message, data);
     }
 
     @Override