chore: 优化大屏设计器api

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;
 
 /**
  *<p>
@@ -34,27 +32,23 @@ public class VisualCategoryController {
 
 	private final IVisualCategoryService visualCategoryService;
 
-
+	private LambdaQueryWrapper<VisualCategory> getQueryWrapper(VisualCategory visualCategory) {
-	@GetMapping("/detail")
+		return new LambdaQueryWrapper<VisualCategory>()
-	@ApiOperation(value = "详情", notes = "传入visualCategory")
+				.like(StrUtil.isNotBlank(visualCategory.getCategoryKey()), VisualCategory::getCategoryKey, visualCategory.getCategoryKey());
-	public R<VisualCategory> detail(VisualCategory visualCategory) {
-		VisualCategory detail = visualCategoryService.getOne(Wrappers.lambdaQuery());
-		return R.ok(detail);
 	}
 
-
 	@GetMapping("/list")
-	@ApiOperation(value = "列表", notes = "传入visualCategory")
+	@ApiOperation(value = "分页列表", notes = "传入visualCategory")
-	public R<List<VisualCategory>> list(VisualCategory visualCategory) {
+	public R<IPage<VisualCategory>> list(Page page, VisualCategory visualCategory) {
-		List<VisualCategory> list = visualCategoryService.list(Wrappers.lambdaQuery());
+		IPage<VisualCategory> pages = visualCategoryService.page(page, getQueryWrapper(visualCategory));
-		return R.ok(list);
+		return R.ok(pages);
 	}
 
-	@GetMapping("/page")
+	@GetMapping("/detail")
-	@ApiOperation(value = "分页", notes = "传入visualCategory")
+	@ApiOperation(value = "根据ID查询", notes = "传入id")
-	public R<IPage<VisualCategory>> page(Page page, VisualCategory visualCategory) {
+	public R<VisualCategory> getById(String id) {
-		IPage<VisualCategory> pages = visualCategoryService.page(page, Wrappers.lambdaQuery());
+		VisualCategory visualCategory = visualCategoryService.getById(id);
-		return R.ok(pages);
+		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) {
+	public R remove(@PathVariable String[] ids) {
-		return R.ok(visualCategoryService.removeByIds(Arrays.asList(StrUtil.join(",", ids))));
+		visualCategoryService.removeByIds(Arrays.asList(ids));
+		return R.ok();
 	}
 
 }

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<IPage<VisualComponentDto>> list(Page page, VisualComponentDto visualComponent) {
+		IPage<VisualComponentDto> pages = visualComponentService.selectVisualComponentPage(page, visualComponent);
+		return R.ok(pages);
+	}
 
 	@GetMapping("/detail")
-	@ApiOperation(value = "详情", notes = "传入visualComponent")
+	@ApiOperation(value = "详情", notes = "传入id")
-	public R<VisualComponent> detail(VisualComponent visualComponent) {
+	public R<VisualComponent> getById(String id) {
-		VisualComponent detail = visualComponentService.getOne(Wrappers.lambdaQuery());
+		VisualComponent detail = visualComponentService.getById(id);
 		return R.ok(detail);
 	}
 
 	@GetMapping("/content")
 	@ApiOperation(value = "组件详情", notes = "传入id")
-	public Map<String, Object> content(Long id) {
+	public Map<String, Object> content(String id) {
 		VisualComponent detail = visualComponentService.getById(id);
 		return JSONUtil.toBean(detail.getContent(), Map.class);
 	}
 
-	@GetMapping("/list")
-	@ApiOperation(value = "分页", notes = "传入visualComponent")
-	public R<IPage<VisualComponentDto>> list(Page page, VisualComponentDto visualComponent) {
-		IPage<VisualComponentDto> 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) {
+	public R remove(@PathVariable String[] ids) {
-		return R.ok(visualComponentService.removeByIds(Arrays.asList(StrUtil.join(",", ids))));
+		visualComponentService.removeByIds(Arrays.asList(ids));
+		return R.ok();
 	}
 
 }

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;
 
-
+	private LambdaQueryWrapper<Visual> getQueryWrapper(Visual visual) {
-	@GetMapping("/detail")
+		return new LambdaQueryWrapper<Visual>()
-	@ApiOperation(value = "详情", notes = "传入visual")
+				.like(StrUtil.isNotBlank(visual.getTitle()), Visual::getTitle, visual.getTitle());
-	public R<VisualDto> detail(@RequestParam String id) {
-		VisualDto detail = visualService.detail(id);
-		return R.ok(detail);
 	}
 
 	@GetMapping("/list")
-	@ApiOperation(value = "分页", notes = "传入visual")
+	@ApiOperation(value = "分页列表", notes = "传入visual")
 	public R<IPage<Visual>> list(Page page, Visual visual) {
-		IPage<Visual> pages = visualService.page(page, Wrappers.lambdaQuery());
+		IPage<Visual> pages = visualService.page(page, getQueryWrapper(visual));
 		return R.ok(pages);
 	}
 
+	@GetMapping("/detail")
+	@ApiOperation(value = "根据ID查询", notes = "传入id")
+	public R<VisualDto> 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<String, String> 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")
+	@PostMapping("/remove//{ids:[\\w,]+}")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R remove(@PathVariable String[] ids) {
-		return R.ok(visualService.removeByIds(Arrays.asList(StrUtil.join(",", ids))));
+		visualService.removeByIds(Arrays.asList(ids));
+		return R.ok();
 	}
 
-
 	@PostMapping("/copy")
 	@ApiOperation(value = "复制", notes = "传入id")
-	public R<String> copy(@ApiParam(value = "主键集合", required = true) @RequestParam String id) {
+	public R<String> copy(String id) {
 		return R.ok(visualService.copyVisual(id));
 	}
 
-
 	@GetMapping("category")
 	@ApiOperation(value = "获取类型")
 	public R category() {

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")
+	private LambdaQueryWrapper<VisualDb> getQueryWrapper(VisualDb visualDb) {
-	@ApiOperation(value = "详情", notes = "传入datasource")
+		return new LambdaQueryWrapper<VisualDb>()
-	public R<VisualDb> detail(VisualDb db) {
+				.like(StrUtil.isNotBlank(visualDb.getName()), VisualDb::getName, visualDb.getName());
-		VisualDb detail = visualDbService.getOne(Wrappers.lambdaQuery());
-		return R.ok(detail);
 	}
 
-
 	@GetMapping("/list")
 	@ApiOperation(value = "分页", notes = "传入datasource")
-	public R<IPage<VisualDb>> list(Page page, VisualDb db) {
+	public R<IPage<VisualDb>> list(Page page, VisualDb visualDb) {
-		IPage<VisualDb> pages = visualDbService.page(page, Wrappers.lambdaQuery());
+		IPage<VisualDb> pages = visualDbService.page(page, getQueryWrapper(visualDb));
 		return R.ok(pages);
 	}
 
+	@GetMapping("/detail")
+	@ApiOperation(value = "详情", notes = "传入id")
+	public R<VisualDb> 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")
+	@PostMapping("/remove//{ids:[\\w,]+}")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R remove(@PathVariable String[] ids) {
-		return R.ok(visualDbService.removeByIds(Arrays.asList(StrUtil.join(",", ids))));
+		visualDbService.removeByIds(Arrays.asList(ids));
+		return R.ok();
 	}
 
 	@PostMapping("/db-test")

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<IPage<VisualMapDto>> list(Page page, VisualMapDto visualMap) {
+		IPage<VisualMapDto> pages = visualMapService.selectVisualMapPage(page, visualMap);
+		return R.ok(pages);
+	}
+
 	@GetMapping("/detail")
-	@ApiOperation(value = "详情", notes = "传入visualMap")
+	@ApiOperation(value = "详情", notes = "传入id")
-	public R<VisualMap> detail(VisualMap visualMap) {
+	public R<VisualMap> detail(String id) {
-		VisualMap detail = visualMapService.getOne(Wrappers.lambdaQuery());
+		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<IPage<VisualMapDto>> list(Page page, VisualMapDto visualMap) {
-		IPage<VisualMapDto> 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//{ids:[\\w,]+}")
-	@PostMapping("/remove")
 	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R remove(@PathVariable String[] ids) {
-		return R.ok(visualMapService.removeByIds(Arrays.asList(StrUtil.join(",", ids))));
+		visualMapService.removeByIds(Arrays.asList(ids));
+		return R.ok();
 	}
 
-
 }

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<VisualRecord> detail(VisualRecord visualRecord) {
-		VisualRecord detail = visualRecordService.getOne(Wrappers.lambdaQuery());
-		return R.ok(detail);
-	}
-
 	@GetMapping("/list")
 	@ApiOperation(value = "分页", notes = "传入visualRecord")
 	public R<IPage<VisualRecordDto>> list(Page page, VisualRecordDto record) {
@@ -48,6 +40,13 @@ public class VisualRecordController {
 		return R.ok(pages);
 	}
 
+	@GetMapping("/detail")
+	@ApiOperation(value = "详情", notes = "传入id")
+	public R<VisualRecord> 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")
+	@PostMapping("/remove//{ids:[\\w,]+}")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R remove(@PathVariable String[] ids) {
-		return R.ok(visualRecordService.removeByIds(Arrays.asList(StrUtil.join(",", ids))));
+		visualRecordService.removeByIds(Arrays.asList(ids));
+		return R.ok();
 	}
 
 }

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<VisualComponent> {
 	 * @param visualComponent
 	 * @return
 	 */
-	List<VisualComponentDto> selectVisualComponentPage(IPage page, VisualComponentDto visualComponent);
+	List<VisualComponentDto> selectVisualComponentPage(Page page, @Param("ew") VisualComponentDto visualComponent);
 
 }

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<VisualMap> {
 	 * @param visualMap
 	 * @return
 	 */
-	List<VisualMapDto> selectVisualMapPage(IPage page, VisualMapDto visualMap);
+	List<VisualMapDto> selectVisualMapPage(Page page, @Param("ew") VisualMapDto visualMap);
 
 }

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<VisualRecord> {
 	 * @param visualRecord
 	 * @return
 	 */
-	List<VisualRecordDto> selectVisualRecordPage(IPage page, VisualRecordDto visualRecord);
+	List<VisualRecordDto> selectVisualRecordPage(Page page, @Param("ew") VisualRecordDto visualRecord);
 
 }

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;
@@ -22,6 +22,6 @@ public interface IVisualComponentService extends IService<VisualComponent> {
 	 * @param visualComponent
 	 * @return
 	 */
-	IPage<VisualComponentDto> selectVisualComponentPage(IPage<VisualComponentDto> page, VisualComponentDto visualComponent);
+	Page<VisualComponentDto> selectVisualComponentPage(Page<VisualComponentDto> page, VisualComponentDto visualComponent);
 
 }

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<VisualMap> {
 	 * @param visualMap
 	 * @return
 	 */
-	IPage<VisualMapDto> selectVisualMapPage(IPage<VisualMapDto> page, VisualMapDto visualMap);
+	Page<VisualMapDto> selectVisualMapPage(Page<VisualMapDto> page, VisualMapDto visualMap);
 
 
 }

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<VisualRecord> {
 	 * @param visualRecord
 	 * @return
 	 */
-	IPage<VisualRecordDto> selectVisualRecordPage(IPage<VisualRecordDto> page, VisualRecordDto visualRecord);
+	Page<VisualRecordDto> selectVisualRecordPage(Page<VisualRecordDto> page, VisualRecordDto visualRecord);
 
 }

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<VisualComponentMapper, VisualComponent> implements IVisualComponentService {
 
 	@Override
-	public IPage<VisualComponentDto> selectVisualComponentPage(IPage<VisualComponentDto> page, VisualComponentDto visualComponent) {
+	public Page<VisualComponentDto> selectVisualComponentPage(Page<VisualComponentDto> page, VisualComponentDto visualComponent) {
 		return page.setRecords(baseMapper.selectVisualComponentPage(page, visualComponent));
 	}
 

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<VisualMapMapper, VisualMap> implements IVisualMapService {
 
 	@Override
-	public IPage<VisualMapDto> selectVisualMapPage(IPage<VisualMapDto> page, VisualMapDto visualMap) {
+	public Page<VisualMapDto> selectVisualMapPage(Page<VisualMapDto> page, VisualMapDto visualMap) {
 		return page.setRecords(baseMapper.selectVisualMapPage(page, visualMap));
 	}
 

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<VisualRecordMapper, VisualRecord> implements IVisualRecordService {
 
 	@Override
-	public IPage<VisualRecordDto> selectVisualRecordPage(IPage<VisualRecordDto> page, VisualRecordDto visualRecord) {
+	public Page<VisualRecordDto> selectVisualRecordPage(Page<VisualRecordDto> page, VisualRecordDto visualRecord) {
 		return page.setRecords(baseMapper.selectVisualRecordPage(page, visualRecord));
 	}
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/bigscreen/VisualComponentMapper.xml

@@ -8,7 +8,6 @@
         <result column="name" property="name"/>
     </resultMap>
 
-
     <select id="selectVisualComponentPage" resultMap="visualComponentResultMap">
         select id, name from sys_visual_component
     </select>