From 4d28bc2d1b9588334ca16eaa51702bcb8a7fcecd Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Tue, 7 May 2019 10:28:56 +0800 Subject: [PATCH] =?UTF-8?q?feat[litemall-core]:=20=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9B=E4=B8=80=E6=AD=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../litemall/core/util/ResponseUtil.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java index 93a0b90a..ef700965 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java @@ -62,9 +62,36 @@ public class ResponseUtil { if (list instanceof Page) { Page page = (Page) list; data.put("total", page.getTotal()); + data.put("page", page.getPageNum()); + data.put("limit", page.getPageSize()); + data.put("pages", page.getPages()); } else{ data.put("total", list.size()); + data.put("page", 1); + data.put("limit", list.size()); + data.put("pages", 1); + } + + return ok(data); + } + + public static Object okList(List list, List pagedList) { + Map data = new HashMap(); + data.put("list", list); + + if (pagedList instanceof Page) { + Page page = (Page) pagedList; + data.put("total", page.getTotal()); + data.put("page", page.getPageNum()); + data.put("limit", page.getPageSize()); + data.put("pages", page.getPages()); + } + else{ + data.put("total", pagedList.size()); + data.put("page", 1); + data.put("limit", pagedList.size()); + data.put("pages", 1); } return ok(data);