From 88f45bc2b72b3ed132fb3ce34c4410283c509180 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Mon, 10 Jul 2023 06:59:54 +0800 Subject: [PATCH] chore: result --- .../bigscreen/controller/VisualCategoryController.java | 4 ++-- .../bigscreen/controller/VisualComponentController.java | 4 ++-- .../kicc/system/bigscreen/controller/VisualController.java | 6 ++---- .../system/bigscreen/controller/VisualDbController.java | 4 ++-- .../system/bigscreen/controller/VisualMapController.java | 4 ++-- .../system/bigscreen/controller/VisualRecordController.java | 4 ++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java index 6daeecef..8e06cb9e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java @@ -39,9 +39,9 @@ public class VisualCategoryController { @GetMapping("/list") @ApiOperation(value = "分页列表", notes = "传入visualCategory") - public R> list(Page page, VisualCategory visualCategory) { + public R list(Page page, VisualCategory visualCategory) { IPage pages = visualCategoryService.page(page, getQueryWrapper(visualCategory)); - return R.ok(pages); + return R.ok(pages.getRecords(), pages.getTotal()); } @GetMapping("/detail") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java index 6eafe120..38e329c0 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java @@ -35,9 +35,9 @@ public class VisualComponentController { @GetMapping("/list") @ApiOperation(value = "分页列表", notes = "传入visualComponent") - public R> list(Page page, VisualComponentDto visualComponent) { + public R list(Page page, VisualComponentDto visualComponent) { IPage pages = visualComponentService.selectVisualComponentPage(page, visualComponent); - return R.ok(pages); + return R.ok(pages.getRecords(), pages.getTotal()); } @GetMapping("/detail") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java index 6726059e..81de2b3e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java @@ -3,7 +3,6 @@ package com.cloud.kicc.system.bigscreen.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; @@ -14,7 +13,6 @@ import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService; import com.cloud.kicc.system.bigscreen.service.IVisualService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -48,9 +46,9 @@ public class VisualController { @GetMapping("/list") @ApiOperation(value = "分页列表", notes = "传入visual") - public R> list(Page page, Visual visual) { + public R list(Page page, Visual visual) { IPage pages = visualService.page(page, getQueryWrapper(visual)); - return R.ok(pages); + return R.ok(pages.getRecords(), pages.getTotal()); } @GetMapping("/detail") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java index 87972db0..c491e058 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java @@ -48,9 +48,9 @@ public class VisualDbController { @GetMapping("/list") @ApiOperation(value = "分页", notes = "传入datasource") - public R> list(Page page, VisualDb visualDb) { + public R list(Page page, VisualDb visualDb) { IPage pages = visualDbService.page(page, getQueryWrapper(visualDb)); - return R.ok(pages); + return R.ok(pages.getRecords(), pages.getTotal()); } @GetMapping("/detail") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java index 5a3ad919..428d195c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java @@ -39,9 +39,9 @@ public class VisualMapController { @GetMapping("/list") @ApiOperation(value = "分页列表", notes = "传入visualMap") - public R> list(Page page, VisualMapDto visualMap) { + public R list(Page page, VisualMapDto visualMap) { IPage pages = visualMapService.selectVisualMapPage(page, visualMap); - return R.ok(pages); + return R.ok(pages.getRecords(), pages.getTotal()); } @GetMapping("/detail") diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java index 3d995058..9e0f0621 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java @@ -35,9 +35,9 @@ public class VisualRecordController { @GetMapping("/list") @ApiOperation(value = "分页", notes = "传入visualRecord") - public R> list(Page page, VisualRecordDto record) { + public R list(Page page, VisualRecordDto record) { IPage pages = visualRecordService.selectVisualRecordPage(page, record); - return R.ok(pages); + return R.ok(pages.getRecords(), pages.getTotal()); } @GetMapping("/detail")