From d7f88b3f6dfe9853578bc8e7c8b2ba9ffc13b3d8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 12 Apr 2023 13:41:11 +0800 Subject: [PATCH] //bug --- .../iformall/controller/MaterialMouldController.java | 11 ++++++++++- .../java/com/iformall/domain/po/sm/MaterialMould.java | 2 ++ .../java/com/iformall/domain/po/sm/PersonMould.java | 5 +++++ .../src/main/resources/mapper/MaterialMouldMapper.xml | 9 +++++++-- .../src/main/resources/mapper/PersonMouldMapper.xml | 8 ++++++-- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java b/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java index e647398..bf736b3 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/MaterialMouldController.java @@ -82,8 +82,17 @@ public class MaterialMouldController extends BaseController { if(record.getType() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"类型为空"); } + if(EnumMouldPatchType.background_mould.getCode().equals(record.getType())){ + if(record.getVideoType() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"视频类型为空"); + } + }else if(EnumMouldPatchType.material_mould.getCode().equals(record.getType())){ + record.setVideoType(null); + }else{ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"类型错误"); + } if(StringUtils.isBlank(record.getMaterial())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"图片为空"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"素材为空"); } if(record.getTitle() == null){ record.setTitle("用户自建"); diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/MaterialMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/MaterialMould.java index 271744c..bf9d549 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/MaterialMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/MaterialMould.java @@ -41,6 +41,8 @@ public class MaterialMould extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="EnumMouldPatchType",name="type") private Integer type; + @io.swagger.annotations.ApiModelProperty(value="EnumVideoType",name="videoType") + private Integer videoType; @io.swagger.annotations.ApiModelProperty(value="名称",name="title") @Excel(name="名称",width = 20,orderNum = "1") private String title; diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java index 68854ca..83c00a4 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java @@ -106,6 +106,11 @@ public class PersonMould extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="素材",name="material") private String material; + @io.swagger.annotations.ApiModelProperty(value="背景Id",name="backgroundId") + private Long backgroundId; + @io.swagger.annotations.ApiModelProperty(value="背景素材",name="backgroundMaterial") + private String backgroundMaterial; + @io.swagger.annotations.ApiModelProperty(value="EnumaMouldPatchStatus 状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="上架时间",name="putonDate") diff --git a/suimangService/src/main/resources/mapper/MaterialMouldMapper.xml b/suimangService/src/main/resources/mapper/MaterialMouldMapper.xml index c5cb79a..8c7deb3 100644 --- a/suimangService/src/main/resources/mapper/MaterialMouldMapper.xml +++ b/suimangService/src/main/resources/mapper/MaterialMouldMapper.xml @@ -6,6 +6,7 @@ + @@ -23,7 +24,7 @@ - `id`, `tenant_id`, `parent_tenant_id`, `type`, + `id`, `tenant_id`, `parent_tenant_id`, `type`,`video_type`, `title`, `sub_title`, `scene_sign`, `sale_price`, `price`, `send_type`, `detail`, `remark`, `material`, `user_id`, `status`, `puton_date`, `create_date`, `update_date` @@ -46,6 +47,10 @@ and `type` = #{type} + + and `video_type` = #{videoType} + + and `title` like concat('%', #{title},'%') @@ -115,7 +120,7 @@