From 387e096260a5039cd08ecdec982a5044c7b64175 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Mon, 10 Jul 2023 06:40:50 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VisualCategoryController.java | 39 ++++++++----------- .../controller/VisualComponentController.java | 32 +++++++-------- .../controller/VisualController.java | 37 ++++++++++-------- .../controller/VisualDbController.java | 31 +++++++++------ .../controller/VisualMapController.java | 29 +++++++------- .../controller/VisualRecordController.java | 24 ++++++------ .../mapper/VisualComponentMapper.java | 5 ++- .../bigscreen/mapper/VisualMapMapper.java | 5 ++- .../bigscreen/mapper/VisualRecordMapper.java | 5 ++- .../service/IVisualComponentService.java | 6 +-- .../bigscreen/service/IVisualMapService.java | 4 +- .../service/IVisualRecordService.java | 4 +- .../impl/VisualComponentServiceImpl.java | 4 +- .../service/impl/VisualMapServiceImpl.java | 4 +- .../service/impl/VisualRecordServiceImpl.java | 4 +- .../bigscreen/VisualComponentMapper.xml | 1 - 16 files changed, 118 insertions(+), 116 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 130e404a..6daeecef 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 @@ -1,8 +1,8 @@ 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; @@ -10,13 +10,11 @@ import com.cloud.kicc.system.api.bigscreen.entity.VisualCategory; import com.cloud.kicc.system.bigscreen.service.IVisualCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.Arrays; -import java.util.List; /** *

@@ -34,27 +32,23 @@ public class VisualCategoryController { private final IVisualCategoryService visualCategoryService; - - @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入visualCategory") - public R detail(VisualCategory visualCategory) { - VisualCategory detail = visualCategoryService.getOne(Wrappers.lambdaQuery()); - return R.ok(detail); + private LambdaQueryWrapper getQueryWrapper(VisualCategory visualCategory) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(visualCategory.getCategoryKey()), VisualCategory::getCategoryKey, visualCategory.getCategoryKey()); } - @GetMapping("/list") - @ApiOperation(value = "列表", notes = "传入visualCategory") - public R> list(VisualCategory visualCategory) { - List list = visualCategoryService.list(Wrappers.lambdaQuery()); - return R.ok(list); + @ApiOperation(value = "分页列表", notes = "传入visualCategory") + public R> list(Page page, VisualCategory visualCategory) { + IPage pages = visualCategoryService.page(page, getQueryWrapper(visualCategory)); + return R.ok(pages); } - @GetMapping("/page") - @ApiOperation(value = "分页", notes = "传入visualCategory") - public R> page(Page page, VisualCategory visualCategory) { - IPage pages = visualCategoryService.page(page, Wrappers.lambdaQuery()); - return R.ok(pages); + @GetMapping("/detail") + @ApiOperation(value = "根据ID查询", notes = "传入id") + public R getById(String id) { + VisualCategory visualCategory = visualCategoryService.getById(id); + return R.ok(visualCategory); } @PostMapping("/save") @@ -69,10 +63,11 @@ public class VisualCategoryController { return R.ok(visualCategoryService.submit(visualCategory)); } - @PostMapping("/remove") + @PostMapping("/remove/{ids:[\\w,]+}") @ApiOperation(value = "删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.ok(visualCategoryService.removeByIds(Arrays.asList(StrUtil.join(",", ids)))); + public R remove(@PathVariable String[] ids) { + visualCategoryService.removeByIds(Arrays.asList(ids)); + return R.ok(); } } 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 dd5a4837..6eafe120 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 @@ -1,9 +1,7 @@ package com.cloud.kicc.system.bigscreen.controller; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; 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; @@ -12,7 +10,6 @@ import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; import com.cloud.kicc.system.bigscreen.service.IVisualComponentService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -36,29 +33,27 @@ public class VisualComponentController { private final IVisualComponentService visualComponentService; + @GetMapping("/list") + @ApiOperation(value = "分页列表", notes = "传入visualComponent") + public R> list(Page page, VisualComponentDto visualComponent) { + IPage pages = visualComponentService.selectVisualComponentPage(page, visualComponent); + return R.ok(pages); + } @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入visualComponent") - public R detail(VisualComponent visualComponent) { - VisualComponent detail = visualComponentService.getOne(Wrappers.lambdaQuery()); + @ApiOperation(value = "详情", notes = "传入id") + public R getById(String id) { + VisualComponent detail = visualComponentService.getById(id); return R.ok(detail); } @GetMapping("/content") @ApiOperation(value = "组件详情", notes = "传入id") - public Map content(Long id) { + public Map content(String id) { VisualComponent detail = visualComponentService.getById(id); return JSONUtil.toBean(detail.getContent(), Map.class); } - @GetMapping("/list") - @ApiOperation(value = "分页", notes = "传入visualComponent") - public R> list(Page page, VisualComponentDto visualComponent) { - IPage pages = visualComponentService.selectVisualComponentPage(page, visualComponent); - return R.ok(pages); - } - - @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入visualComponent") public R save(@Valid @RequestBody VisualComponent visualComponent) { @@ -71,10 +66,11 @@ public class VisualComponentController { return R.ok(visualComponentService.updateById(visualComponent)); } - @PostMapping("/remove") + @PostMapping("/remove/{ids:[\\w,]+}") @ApiOperation(value = "删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.ok(visualComponentService.removeByIds(Arrays.asList(StrUtil.join(",", ids)))); + public R remove(@PathVariable String[] ids) { + visualComponentService.removeByIds(Arrays.asList(ids)); + return R.ok(); } } 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 59ab461a..6726059e 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 @@ -1,6 +1,7 @@ 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; @@ -40,21 +41,25 @@ public class VisualController { private final IVisualService visualService; private final IVisualCategoryService categoryService; - - @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入visual") - public R detail(@RequestParam String id) { - VisualDto detail = visualService.detail(id); - return R.ok(detail); + private LambdaQueryWrapper getQueryWrapper(Visual visual) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(visual.getTitle()), Visual::getTitle, visual.getTitle()); } @GetMapping("/list") - @ApiOperation(value = "分页", notes = "传入visual") + @ApiOperation(value = "分页列表", notes = "传入visual") public R> list(Page page, Visual visual) { - IPage pages = visualService.page(page, Wrappers.lambdaQuery()); + IPage pages = visualService.page(page, getQueryWrapper(visual)); return R.ok(pages); } + @GetMapping("/detail") + @ApiOperation(value = "根据ID查询", notes = "传入id") + public R detail(String id) { + VisualDto detail = visualService.detail(id); + return R.ok(detail); + } + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入visual") public R save(@Valid @RequestBody VisualDto visual) { @@ -62,34 +67,32 @@ public class VisualController { if (temp) { String id = visual.getVisual().getId(); Map map = new HashMap(); - map.put("id", String.valueOf(id)); + map.put("id", id); return R.ok(map); } else { return R.error(false); } } - @PostMapping("/update") @ApiOperation(value = "修改", notes = "传入visual") public R update(@Valid @RequestBody VisualDto visual) { return R.ok(visualService.updateVisual(visual)); } - @PostMapping("/remove") - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.ok(visualService.removeByIds(Arrays.asList(StrUtil.join(",", ids)))); + @PostMapping("/remove//{ids:[\\w,]+}") + @ApiOperation(value = "删除", notes = "传入ids") + public R remove(@PathVariable String[] ids) { + visualService.removeByIds(Arrays.asList(ids)); + return R.ok(); } - @PostMapping("/copy") @ApiOperation(value = "复制", notes = "传入id") - public R copy(@ApiParam(value = "主键集合", required = true) @RequestParam String id) { + public R copy(String id) { return R.ok(visualService.copyVisual(id)); } - @GetMapping("category") @ApiOperation(value = "获取类型") public R category() { 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 70c0242e..87972db0 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 @@ -1,6 +1,7 @@ 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; @@ -9,6 +10,7 @@ import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.system.api.bigscreen.dto.DynamicModelDto; import com.cloud.kicc.system.api.bigscreen.dto.VisualDbDto; +import com.cloud.kicc.system.api.bigscreen.entity.Visual; import com.cloud.kicc.system.api.bigscreen.entity.VisualDb; import com.cloud.kicc.system.bigscreen.service.IVisualDbService; import io.swagger.annotations.Api; @@ -39,21 +41,25 @@ public class VisualDbController { private final IVisualDbService visualDbService; - @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入datasource") - public R detail(VisualDb db) { - VisualDb detail = visualDbService.getOne(Wrappers.lambdaQuery()); - return R.ok(detail); + private LambdaQueryWrapper getQueryWrapper(VisualDb visualDb) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(visualDb.getName()), VisualDb::getName, visualDb.getName()); } - @GetMapping("/list") @ApiOperation(value = "分页", notes = "传入datasource") - public R> list(Page page, VisualDb db) { - IPage pages = visualDbService.page(page, Wrappers.lambdaQuery()); + public R> list(Page page, VisualDb visualDb) { + IPage pages = visualDbService.page(page, getQueryWrapper(visualDb)); return R.ok(pages); } + @GetMapping("/detail") + @ApiOperation(value = "详情", notes = "传入id") + public R detail(String id) { + VisualDb detail = visualDbService.getById(id); + return R.ok(detail); + } + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入datasource") public R save(@Valid @RequestBody VisualDb db) { @@ -84,10 +90,11 @@ public class VisualDbController { throw new CheckedException("系统检测数据库未能连通,请检查配置"); } - @PostMapping("/remove") - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.ok(visualDbService.removeByIds(Arrays.asList(StrUtil.join(",", ids)))); + @PostMapping("/remove//{ids:[\\w,]+}") + @ApiOperation(value = "删除", notes = "传入ids") + public R remove(@PathVariable String[] ids) { + visualDbService.removeByIds(Arrays.asList(ids)); + return R.ok(); } @PostMapping("/db-test") 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 6fccbd8a..5a3ad919 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 @@ -37,10 +37,17 @@ public class VisualMapController { private final IVisualMapService visualMapService; + @GetMapping("/list") + @ApiOperation(value = "分页列表", notes = "传入visualMap") + public R> list(Page page, VisualMapDto visualMap) { + IPage pages = visualMapService.selectVisualMapPage(page, visualMap); + return R.ok(pages); + } + @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入visualMap") - public R detail(VisualMap visualMap) { - VisualMap detail = visualMapService.getOne(Wrappers.lambdaQuery()); + @ApiOperation(value = "详情", notes = "传入id") + public R detail(String id) { + VisualMap detail = visualMapService.getById(id); return R.ok(detail); } @@ -51,13 +58,6 @@ public class VisualMapController { return JSONUtil.toBean(detail.getData(), Map.class); } - @GetMapping("/list") - @ApiOperation(value = "分页", notes = "传入visualMap") - public R> list(Page page, VisualMapDto visualMap) { - IPage pages = visualMapService.selectVisualMapPage(page, visualMap); - return R.ok(pages); - } - @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入visualMap") public R save(@Valid @RequestBody VisualMap visualMap) { @@ -70,12 +70,11 @@ public class VisualMapController { return R.ok(visualMapService.updateById(visualMap)); } - - @PostMapping("/remove") + @PostMapping("/remove//{ids:[\\w,]+}") @ApiOperation(value = "删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.ok(visualMapService.removeByIds(Arrays.asList(StrUtil.join(",", ids)))); + public R remove(@PathVariable String[] ids) { + visualMapService.removeByIds(Arrays.asList(ids)); + return R.ok(); } - } 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 fad47953..3d995058 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 @@ -2,7 +2,6 @@ package com.cloud.kicc.system.bigscreen.controller; import cn.hutool.core.util.StrUtil; 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; @@ -34,13 +33,6 @@ public class VisualRecordController { private final IVisualRecordService visualRecordService; - @GetMapping("/detail") - @ApiOperation(value = "详情", notes = "传入visualRecord") - public R detail(VisualRecord visualRecord) { - VisualRecord detail = visualRecordService.getOne(Wrappers.lambdaQuery()); - return R.ok(detail); - } - @GetMapping("/list") @ApiOperation(value = "分页", notes = "传入visualRecord") public R> list(Page page, VisualRecordDto record) { @@ -48,6 +40,13 @@ public class VisualRecordController { return R.ok(pages); } + @GetMapping("/detail") + @ApiOperation(value = "详情", notes = "传入id") + public R detail(String id) { + VisualRecord detail = visualRecordService.getById(id); + return R.ok(detail); + } + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入visualRecord") public R save(@Valid @RequestBody VisualRecord visualRecord) { @@ -66,10 +65,11 @@ public class VisualRecordController { return R.ok(visualRecordService.saveOrUpdate(visualRecord)); } - @PostMapping("/remove") - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.ok(visualRecordService.removeByIds(Arrays.asList(StrUtil.join(",", ids)))); + @PostMapping("/remove//{ids:[\\w,]+}") + @ApiOperation(value = "删除", notes = "传入ids") + public R remove(@PathVariable String[] ids) { + visualRecordService.removeByIds(Arrays.asList(ids)); + return R.ok(); } } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java index d56353b8..8297abca 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualComponentMapper.java @@ -1,9 +1,10 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.system.api.bigscreen.dto.VisualComponentDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,6 +25,6 @@ public interface VisualComponentMapper extends BaseMapper { * @param visualComponent * @return */ - List selectVisualComponentPage(IPage page, VisualComponentDto visualComponent); + List selectVisualComponentPage(Page page, @Param("ew") VisualComponentDto visualComponent); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java index bde46e51..ffeaef35 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualMapMapper.java @@ -1,9 +1,10 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.system.api.bigscreen.dto.VisualMapDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualMap; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,6 +25,6 @@ public interface VisualMapMapper extends BaseMapper { * @param visualMap * @return */ - List selectVisualMapPage(IPage page, VisualMapDto visualMap); + List selectVisualMapPage(Page page, @Param("ew") VisualMapDto visualMap); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java index 9f2d5c39..719af44c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/mapper/VisualRecordMapper.java @@ -1,9 +1,10 @@ package com.cloud.kicc.system.bigscreen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.system.api.bigscreen.dto.VisualRecordDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualRecord; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,6 +26,6 @@ public interface VisualRecordMapper extends BaseMapper { * @param visualRecord * @return */ - List selectVisualRecordPage(IPage page, VisualRecordDto visualRecord); + List selectVisualRecordPage(Page page, @Param("ew") VisualRecordDto visualRecord); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java index 034628ae..a3a4f012 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualComponentService.java @@ -1,6 +1,6 @@ package com.cloud.kicc.system.bigscreen.service; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.cloud.kicc.system.api.bigscreen.dto.VisualComponentDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; @@ -15,13 +15,13 @@ import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; */ public interface IVisualComponentService extends IService { -/** + /** * 自定义分页 * * @param page * @param visualComponent * @return */ - IPage selectVisualComponentPage(IPage page, VisualComponentDto visualComponent); + Page selectVisualComponentPage(Page page, VisualComponentDto visualComponent); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java index 7ba572b8..c2154241 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualMapService.java @@ -1,6 +1,6 @@ package com.cloud.kicc.system.bigscreen.service; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.cloud.kicc.system.api.bigscreen.dto.VisualMapDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualMap; @@ -22,7 +22,7 @@ public interface IVisualMapService extends IService { * @param visualMap * @return */ - IPage selectVisualMapPage(IPage page, VisualMapDto visualMap); + Page selectVisualMapPage(Page page, VisualMapDto visualMap); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java index 0a3200d9..d44687fe 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/IVisualRecordService.java @@ -1,6 +1,6 @@ package com.cloud.kicc.system.bigscreen.service; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.cloud.kicc.system.api.bigscreen.dto.VisualRecordDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualRecord; @@ -23,6 +23,6 @@ public interface IVisualRecordService extends IService { * @param visualRecord * @return */ - IPage selectVisualRecordPage(IPage page, VisualRecordDto visualRecord); + Page selectVisualRecordPage(Page page, VisualRecordDto visualRecord); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualComponentServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualComponentServiceImpl.java index 086271cc..3410a32c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualComponentServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualComponentServiceImpl.java @@ -1,6 +1,6 @@ package com.cloud.kicc.system.bigscreen.service.impl; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cloud.kicc.system.api.bigscreen.dto.VisualComponentDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualComponent; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; public class VisualComponentServiceImpl extends ServiceImpl implements IVisualComponentService { @Override - public IPage selectVisualComponentPage(IPage page, VisualComponentDto visualComponent) { + public Page selectVisualComponentPage(Page page, VisualComponentDto visualComponent) { return page.setRecords(baseMapper.selectVisualComponentPage(page, visualComponent)); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java index c3ebdbbe..52d1a810 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualMapServiceImpl.java @@ -1,6 +1,6 @@ package com.cloud.kicc.system.bigscreen.service.impl; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cloud.kicc.system.api.bigscreen.dto.VisualMapDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualMap; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; public class VisualMapServiceImpl extends ServiceImpl implements IVisualMapService { @Override - public IPage selectVisualMapPage(IPage page, VisualMapDto visualMap) { + public Page selectVisualMapPage(Page page, VisualMapDto visualMap) { return page.setRecords(baseMapper.selectVisualMapPage(page, visualMap)); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualRecordServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualRecordServiceImpl.java index 2a0081ac..3ac10b92 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualRecordServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualRecordServiceImpl.java @@ -1,6 +1,6 @@ package com.cloud.kicc.system.bigscreen.service.impl; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cloud.kicc.system.api.bigscreen.dto.VisualRecordDto; import com.cloud.kicc.system.api.bigscreen.entity.VisualRecord; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; public class VisualRecordServiceImpl extends ServiceImpl implements IVisualRecordService { @Override - public IPage selectVisualRecordPage(IPage page, VisualRecordDto visualRecord) { + public Page selectVisualRecordPage(Page page, VisualRecordDto visualRecord) { return page.setRecords(baseMapper.selectVisualRecordPage(page, visualRecord)); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml index 5d221170..c444ba62 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml @@ -8,7 +8,6 @@ -