From 310909003703c1f821a4cd0ab3c585b125705c55 Mon Sep 17 00:00:00 2001 From: shikong <919411476@qq.com> Date: Mon, 9 Dec 2024 16:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wx/services/mp/controller/MpAppController.java | 8 +------- .../docking/wx/services/mp/convertor/MpAppConvertor.java | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/controller/MpAppController.java b/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/controller/MpAppController.java index 821f409..14a6543 100644 --- a/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/controller/MpAppController.java +++ b/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/controller/MpAppController.java @@ -42,13 +42,7 @@ public class MpAppController { @Parameter(name = "pageSize", description = "条数", example = "10") }) public JsonResponse> getMpAppListPage(@RequestParam Integer pageNo, @RequestParam Integer pageSize) { - PageWrapper mpAppPageList = mpAppService.getMpAppPageList(pageNo, pageSize); - PageWrapper mpAppDtoPageList = PageWrapper.of(MpAppConvertor.INSTANCE.toMpAppDto(mpAppPageList.getData()), - mpAppPageList.getPage(), - mpAppPageList.getPageSize(), - mpAppPageList.getPageTotal(), - mpAppPageList.getTotal()); - return JsonResponse.success(mpAppDtoPageList); + return JsonResponse.success(MpAppConvertor.INSTANCE.toMpAppDto(mpAppService.getMpAppPageList(pageNo, pageSize))); } @RequestMapping("/{appId}") diff --git a/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/convertor/MpAppConvertor.java b/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/convertor/MpAppConvertor.java index f10cc25..f23e1db 100644 --- a/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/convertor/MpAppConvertor.java +++ b/platform-services/wx-mp-service/src/main/java/cn/skcks/docking/wx/services/mp/convertor/MpAppConvertor.java @@ -1,5 +1,6 @@ package cn.skcks.docking.wx.services.mp.convertor; +import cn.skcks.docking.wx.common.page.PageWrapper; import cn.skcks.docking.wx.orm.entity.MpApp; import cn.skcks.docking.wx.services.mp.dto.app.MpAppDto; import org.mapstruct.Mapper; @@ -17,4 +18,6 @@ public abstract class MpAppConvertor { abstract public List toMpAppDto(List mpApp); abstract public Collection toMpAppDto(Collection mpApp); + + abstract public PageWrapper toMpAppDto(PageWrapper mpApp); }