From 92dabf2a7c428b435467921d26c32026495eb8b0 Mon Sep 17 00:00:00 2001 From: liujun Date: Sat, 13 Apr 2024 10:59:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/dw/DwController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/dw/DwController.java b/src/main/java/com/zcloud/controller/dw/DwController.java index e0fe2f7d..a8428c27 100644 --- a/src/main/java/com/zcloud/controller/dw/DwController.java +++ b/src/main/java/com/zcloud/controller/dw/DwController.java @@ -25,9 +25,12 @@ public class DwController extends BaseController { } @RequestMapping(value = "getMapList") - public Object getMapList() throws Exception { + public Object getMapList(Page page) throws Exception { PageData pd = this.getPageData(); MapGet mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), MapGet.class); + mapGet.getPage().setPage(page.getPage()); + mapGet.getPage().setCurrent(page.getCurrent()); + mapGet.getPage().setSize(page.getSize()); return dwService.getMapList(mapGet); } @@ -39,9 +42,12 @@ public class DwController extends BaseController { } @RequestMapping(value = "getAlarmList") - public Object getAlarmList() throws Exception { + public Object getAlarmList(Page page) throws Exception { PageData pd = this.getPageData(); AlarmGet mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), AlarmGet.class); + mapGet.getPage().setPage(page.getPage()); + mapGet.getPage().setCurrent(page.getCurrent()); + mapGet.getPage().setSize(page.getSize()); return dwService.getAlarmList(mapGet); }