From 050f0bb6a259a9425b1717a8515736789ab234d1 Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Sat, 24 Jun 2023 21:09:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A3=85=E4=BF=AE=20review?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/optional/mall.sql | 6 +++--- ...atePageTypeEnum.java => DecoratePageEnum.java} | 10 +++++----- .../decorate/DecorateComponentController.java | 8 ++++---- .../admin/decorate/vo/DecorateComponentReqVO.java | 14 +++++++------- .../decorate/vo/DecorateComponentRespVO.java | 8 ++++---- .../app/decorate/AppDecorateController.java | 8 ++++---- .../decorate/vo/AppDecorateComponentRespVO.java | 11 ++++------- .../decorate/DecorateComponentConvert.java | 14 +++++++------- .../dataobject/decorate/DecorateComponentDO.java | 15 +++++++-------- .../mysql/decorate/DecorateComponentMapper.java | 4 ++-- .../decorate/DecorateComponentService.java | 8 ++++---- .../decorate/DecorateComponentServiceImpl.java | 8 ++++---- .../DecorateComponentServiceImplTest.java | 8 ++++---- 13 files changed, 59 insertions(+), 63 deletions(-) rename yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/decorate/{DecoratePageTypeEnum.java => DecoratePageEnum.java} (72%) diff --git a/sql/mysql/optional/mall.sql b/sql/mysql/optional/mall.sql index 7a3c519f3..655c03073 100644 --- a/sql/mysql/optional/mall.sql +++ b/sql/mysql/optional/mall.sql @@ -453,9 +453,9 @@ CREATE TABLE `trade_delivery_express` ( DROP TABLE IF EXISTS `promotion_decorate_component`; CREATE TABLE `promotion_decorate_component` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', - `type` int NOT NULL COMMENT '页面类型', - `component_code` varchar(64) NOT NULL COMMENT '组件编码', - `component_value` json NOT NULL COMMENT '组件值：json 格式。包含配置和数据', + `page_id` int NOT NULL COMMENT '所属页面id', + `code` varchar(64) NOT NULL COMMENT '组件编码', + `value` json NOT NULL COMMENT '组件值：json 格式。包含配置和数据', `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态', `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', diff --git a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/decorate/DecoratePageTypeEnum.java b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/decorate/DecoratePageEnum.java similarity index 72% rename from yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/decorate/DecoratePageTypeEnum.java rename to yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/decorate/DecoratePageEnum.java index 17591fa1b..7e6ae2122 100644 --- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/decorate/DecoratePageTypeEnum.java +++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/decorate/DecoratePageEnum.java @@ -7,22 +7,22 @@ import lombok.Getter; import java.util.Arrays; /** - * 装修页面类型枚举 + * 装修页面枚举 * * @author jason */ @AllArgsConstructor @Getter -public enum DecoratePageTypeEnum implements IntArrayValuable { +public enum DecoratePageEnum implements IntArrayValuable { INDEX(1, "首页"); - private static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DecoratePageTypeEnum::getType).toArray(); + private static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DecoratePageEnum::getId).toArray(); /** - * 页面类型 + * 页面 id */ - private final Integer type; + private final Integer id; /** * 页面名称 */ diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/DecorateComponentController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/DecorateComponentController.java index fa694e75d..a4f920698 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/DecorateComponentController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/DecorateComponentController.java @@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.promotion.controller.admin.decorate.vo.DecorateComponentReqVO; import cn.iocoder.yudao.module.promotion.controller.admin.decorate.vo.DecorateComponentRespVO; -import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageTypeEnum; +import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageEnum; import cn.iocoder.yudao.module.promotion.service.decorate.DecorateComponentService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -36,11 +36,11 @@ public class DecorateComponentController { @GetMapping("/get-page-components") @Operation(summary = "获取装修页面组件") - @Parameter(name = "type", description = "页面类型", required = true) + @Parameter(name = "pageId", description = "页面 id", required = true) // TODO 加权限 public CommonResult getPageComponents( - @RequestParam("type") @InEnum(DecoratePageTypeEnum.class) Integer type) { - return success(INSTANCE.convert2(type, decorateComponentService.getPageComponents(type))); + @RequestParam("pageId") @InEnum(DecoratePageEnum.class) Integer pageId) { + return success(INSTANCE.convert2(pageId, decorateComponentService.getPageComponents(pageId))); } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentReqVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentReqVO.java index d4827e2eb..de349a02d 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentReqVO.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.promotion.controller.admin.decorate.vo; import cn.iocoder.yudao.framework.common.validation.InEnum; -import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageTypeEnum; +import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -13,10 +13,10 @@ import java.util.List; @Schema(description = "管理后台 - 页面装修 Request VO ") @Data public class DecorateComponentReqVO { - @Schema(description = "页面类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "页面类型不能为空") - @InEnum(DecoratePageTypeEnum.class) - private Integer type; + @Schema(description = "页面 id ", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "页面 id 不能为空") + @InEnum(DecoratePageEnum.class) + private Integer pageId; @Schema(description = "页面组件列表", requiredMode = Schema.RequiredMode.REQUIRED, example = "TODO") @NotEmpty(message = "页面组件列表不能为空") @@ -31,11 +31,11 @@ public class DecorateComponentReqVO { @Schema(description = "组件编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "nav-menu") @NotEmpty(message = "组件编码不能为空") - private String componentCode; + private String code; @Schema(description = "组件对应值, json 字符串, 含内容配置，具体数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "TODO") @NotEmpty(message = "组件值为空") - private String componentValue; + private String value; } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentRespVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentRespVO.java index b16276e45..5928034a4 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentRespVO.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/decorate/vo/DecorateComponentRespVO.java @@ -9,8 +9,8 @@ import java.util.List; @Data public class DecorateComponentRespVO { - @Schema(description = "页面类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer type; + @Schema(description = "页面 id ", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Integer pageId; @Schema(description = "页面组件", requiredMode = Schema.RequiredMode.REQUIRED, example = "TODO") private List components; @@ -23,10 +23,10 @@ public class DecorateComponentRespVO { private Long id; @Schema(description = "组件编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "nav-menu") - private String componentCode; + private String code; @Schema(description = "组件的内容配置项", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "TODO") - private String componentValue; + private String value; } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/AppDecorateController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/AppDecorateController.java index 6df9575f0..1f5e64b19 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/AppDecorateController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/AppDecorateController.java @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.promotion.controller.app.decorate; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.module.promotion.controller.app.decorate.vo.AppDecorateComponentRespVO; -import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageTypeEnum; +import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageEnum; import cn.iocoder.yudao.module.promotion.service.decorate.DecorateComponentService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -30,10 +30,10 @@ public class AppDecorateController { @GetMapping("/get-page-components") @Operation(summary = "获取装修页面组件") - @Parameter(name = "type", description = "页面类型", required = true) + @Parameter(name = "pageId", description = "页面 id", required = true) public CommonResult getPageComponents( - @RequestParam("type") @InEnum(DecoratePageTypeEnum.class) Integer type) { - return success(INSTANCE.appConvert(type, decorateComponentService.getPageComponents(type))); + @RequestParam("pageId") @InEnum(DecoratePageEnum.class) Integer pageId) { + return success(INSTANCE.appConvert(pageId, decorateComponentService.getPageComponents(pageId))); } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/vo/AppDecorateComponentRespVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/vo/AppDecorateComponentRespVO.java index c9bf90210..9f52f5923 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/vo/AppDecorateComponentRespVO.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/decorate/vo/AppDecorateComponentRespVO.java @@ -9,8 +9,8 @@ import java.util.List; @Data public class AppDecorateComponentRespVO { - @Schema(description = "页面类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer type; + @Schema(description = "页面 id ", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Integer pageId; @Schema(description = "页面组件", requiredMode = Schema.RequiredMode.REQUIRED, example = "TODO") private List components; @@ -19,14 +19,11 @@ public class AppDecorateComponentRespVO { @Data public static class AppComponentRespVO { - @Schema(description = "组件编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long id; - @Schema(description = "组件编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "nav-menu") - private String componentCode; + private String code; @Schema(description = "组件的内容配置项", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "TODO") - private String componentValue; + private String value; } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/decorate/DecorateComponentConvert.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/decorate/DecorateComponentConvert.java index 8fd310e6c..2a163fb17 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/decorate/DecorateComponentConvert.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/decorate/DecorateComponentConvert.java @@ -18,23 +18,23 @@ public interface DecorateComponentConvert { DecorateComponentConvert INSTANCE = Mappers.getMapper(DecorateComponentConvert.class); - default List convertList(Integer type, List components) { - return CollectionUtils.convertList(components, c -> convert(type, c)); + default List convertList(Integer pageId, List components) { + return CollectionUtils.convertList(components, c -> convert(pageId, c)); } - default DecorateComponentRespVO convert2(Integer type, List list) { + default DecorateComponentRespVO convert2(Integer pageId, List list) { List components = CollectionUtils.convertList(list, this::convert3); - return new DecorateComponentRespVO().setType(type).setComponents(components); + return new DecorateComponentRespVO().setPageId(pageId).setComponents(components); } - DecorateComponentDO convert(Integer type, DecorateComponentReqVO.ComponentReqVO reqVO); + DecorateComponentDO convert(Integer pageId, DecorateComponentReqVO.ComponentReqVO reqVO); ComponentRespVO convert3(DecorateComponentDO componentDO); // ========== App convert ========== - default AppDecorateComponentRespVO appConvert(Integer type, List list) { + default AppDecorateComponentRespVO appConvert(Integer pageId, List list) { List components = CollectionUtils.convertList(list, this::appConvert2); - return new AppDecorateComponentRespVO().setType(type).setComponents(components); + return new AppDecorateComponentRespVO().setPageId(pageId).setComponents(components); } AppComponentRespVO appConvert2(DecorateComponentDO bean); diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/decorate/DecorateComponentDO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/decorate/DecorateComponentDO.java index 0740921ad..f33401c77 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/decorate/DecorateComponentDO.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/decorate/DecorateComponentDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.promotion.dal.dataobject.decorate; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageTypeEnum; +import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageEnum; import cn.iocoder.yudao.module.promotion.enums.decorate.DecorateComponentEnum; import com.baomidou.mybatisplus.annotation.*; @@ -24,23 +24,22 @@ public class DecorateComponentDO extends BaseDO { @TableId private Long id; - // TODO @jason：要不改成 page？貌似更合理； /** - * 页面类型 - * 枚举 {@link DecoratePageTypeEnum#getType()} + * 所属页面 id + * 枚举 {@link DecoratePageEnum#getId()} */ - private Integer type; + private Integer pageId; - // TODO @jason：code、value，因为在 component /** * 组件编码 * 枚举 {@link DecorateComponentEnum#getCode()} */ - private String componentCode; + private String code; + /** * 组件值：json 格式。包含配置和数据 */ - private String componentValue; + private String value; /** * 状态 diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/decorate/DecorateComponentMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/decorate/DecorateComponentMapper.java index d78fc3b4f..4773d40bc 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/decorate/DecorateComponentMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/decorate/DecorateComponentMapper.java @@ -9,8 +9,8 @@ import java.util.List; @Mapper public interface DecorateComponentMapper extends BaseMapperX { - default List selectByPageType(Integer type){ - return selectList(DecorateComponentDO::getType, type); + default List selectByPage(Integer pageId){ + return selectList(DecorateComponentDO::getPageId, pageId); } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentService.java index c9f8a6b67..2ecd84452 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentService.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentService.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.promotion.service.decorate; import cn.iocoder.yudao.module.promotion.controller.admin.decorate.vo.DecorateComponentReqVO; import cn.iocoder.yudao.module.promotion.dal.dataobject.decorate.DecorateComponentDO; -import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageTypeEnum; +import cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageEnum; import java.util.List; @@ -21,10 +21,10 @@ public interface DecorateComponentService { void pageSave(DecorateComponentReqVO reqVO); /** - * 根据页面类型。获取页面的组件信息 + * 根据页面 id。获取页面的组件信息 * - * @param type 页面类型 {@link DecoratePageTypeEnum#getType()} + * @param pageId 页面类型 {@link DecoratePageEnum#getId()} */ - List getPageComponents(Integer type); + List getPageComponents(Integer pageId); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImpl.java index 0cf88861b..731ead70f 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImpl.java @@ -29,9 +29,9 @@ public class DecorateComponentServiceImpl implements DecorateComponentService { @Override public void pageSave(DecorateComponentReqVO reqVO) { // 1.新增或修改页面组件 - List oldList = decorateComponentMapper.selectByPageType(reqVO.getType()); + List oldList = decorateComponentMapper.selectByPage(reqVO.getPageId()); - decorateComponentMapper.saveOrUpdateBatch(INSTANCE.convertList(reqVO.getType(), reqVO.getComponents())); + decorateComponentMapper.saveOrUpdateBatch(INSTANCE.convertList(reqVO.getPageId(), reqVO.getComponents())); // 2.删除相关组件 Set deleteIds = convertSet(oldList, DecorateComponentDO::getId); deleteIds.removeAll(convertSet(reqVO.getComponents(), ComponentReqVO::getId, vo->Objects.nonNull(vo.getId()))); @@ -41,8 +41,8 @@ public class DecorateComponentServiceImpl implements DecorateComponentService { } @Override - public List getPageComponents(Integer type) { - return decorateComponentMapper.selectByPageType(type); + public List getPageComponents(Integer pageId) { + return decorateComponentMapper.selectByPage(pageId); } } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java b/yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java index ba196e3f3..c78e4ddc4 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; import static cn.iocoder.yudao.module.promotion.enums.decorate.DecorateComponentEnum.ROLLING_BANNER; -import static cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageTypeEnum.INDEX; +import static cn.iocoder.yudao.module.promotion.enums.decorate.DecoratePageEnum.INDEX; import static org.mockito.ArgumentMatchers.eq; /** @@ -36,10 +36,10 @@ public class DecorateComponentServiceImplTest extends BaseMockitoUnitTest { void testResp(){ List list = new ArrayList<>(1); DecorateComponentDO decorateDO = new DecorateComponentDO() - .setType(INDEX.getType()).setComponentValue("") - .setComponentCode(ROLLING_BANNER.getCode()).setId(1L); + .setPageId(INDEX.getId()).setValue("") + .setCode(ROLLING_BANNER.getCode()).setId(1L); list.add(decorateDO); //mock 方法 - Mockito.when(decorateComponentMapper.selectByPageType(eq(1))).thenReturn(list); + Mockito.when(decorateComponentMapper.selectByPage(eq(1))).thenReturn(list); } } \ No newline at end of file