Browse Source

chore: result

master
wangxiang 2 years ago
parent
commit
88f45bc2b7
  1. 4
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualCategoryController.java
  2. 4
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java
  3. 6
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualController.java
  4. 4
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualDbController.java
  5. 4
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java
  6. 4
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualRecordController.java

4
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 { @@ -39,9 +39,9 @@ public class VisualCategoryController {
@GetMapping("/list")
@ApiOperation(value = "分页列表", notes = "传入visualCategory")
public R<IPage<VisualCategory>> list(Page page, VisualCategory visualCategory) {
public R list(Page page, VisualCategory visualCategory) {
IPage<VisualCategory> pages = visualCategoryService.page(page, getQueryWrapper(visualCategory));
return R.ok(pages);
return R.ok(pages.getRecords(), pages.getTotal());
}
@GetMapping("/detail")

4
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 { @@ -35,9 +35,9 @@ public class VisualComponentController {
@GetMapping("/list")
@ApiOperation(value = "分页列表", notes = "传入visualComponent")
public R<IPage<VisualComponentDto>> list(Page page, VisualComponentDto visualComponent) {
public R list(Page page, VisualComponentDto visualComponent) {
IPage<VisualComponentDto> pages = visualComponentService.selectVisualComponentPage(page, visualComponent);
return R.ok(pages);
return R.ok(pages.getRecords(), pages.getTotal());
}
@GetMapping("/detail")

6
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; @@ -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; @@ -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 { @@ -48,9 +46,9 @@ public class VisualController {
@GetMapping("/list")
@ApiOperation(value = "分页列表", notes = "传入visual")
public R<IPage<Visual>> list(Page page, Visual visual) {
public R list(Page page, Visual visual) {
IPage<Visual> pages = visualService.page(page, getQueryWrapper(visual));
return R.ok(pages);
return R.ok(pages.getRecords(), pages.getTotal());
}
@GetMapping("/detail")

4
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 { @@ -48,9 +48,9 @@ public class VisualDbController {
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入datasource")
public R<IPage<VisualDb>> list(Page page, VisualDb visualDb) {
public R list(Page page, VisualDb visualDb) {
IPage<VisualDb> pages = visualDbService.page(page, getQueryWrapper(visualDb));
return R.ok(pages);
return R.ok(pages.getRecords(), pages.getTotal());
}
@GetMapping("/detail")

4
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 { @@ -39,9 +39,9 @@ public class VisualMapController {
@GetMapping("/list")
@ApiOperation(value = "分页列表", notes = "传入visualMap")
public R<IPage<VisualMapDto>> list(Page page, VisualMapDto visualMap) {
public R list(Page page, VisualMapDto visualMap) {
IPage<VisualMapDto> pages = visualMapService.selectVisualMapPage(page, visualMap);
return R.ok(pages);
return R.ok(pages.getRecords(), pages.getTotal());
}
@GetMapping("/detail")

4
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 { @@ -35,9 +35,9 @@ public class VisualRecordController {
@GetMapping("/list")
@ApiOperation(value = "分页", notes = "传入visualRecord")
public R<IPage<VisualRecordDto>> list(Page page, VisualRecordDto record) {
public R list(Page page, VisualRecordDto record) {
IPage<VisualRecordDto> pages = visualRecordService.selectVisualRecordPage(page, record);
return R.ok(pages);
return R.ok(pages.getRecords(), pages.getTotal());
}
@GetMapping("/detail")

Loading…
Cancel
Save