diff --git a/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java b/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java index afac523..0239363 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java @@ -55,16 +55,8 @@ public class MouldPatchController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] MouldPatchController::findById"); - MouldPatch mouldPatch = mouldPatchService.getById(id); - if(mouldPatch.getSceneSignList() != null && !mouldPatch.getSceneSignList().isEmpty()){ - MouldPatchSign signQ = new MouldPatchSign(); - signQ.setIds(mouldPatch.getSceneSignList()); - List signList = mouldPatchSignService.getList(signQ); - mouldPatch.setMouldPatchSign(signList); - } - if(mouldPatch.getColour() != null){ - mouldPatch.setColourStr(EnumColour.getEnum(mouldPatch.getColour()).getMessage()); - } + MouldPatch mouldPatch = mouldPatchService.getDetailById(id); + return new ResultData(mouldPatch); } diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java index c7f00db..2b2783c 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java @@ -36,6 +36,9 @@ public class UserMouldVideoController extends BaseController { @Autowired private UserMouldVideoService userMouldVideoService; + @Autowired + private MouldPatchService mouldPatchService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -59,6 +62,15 @@ public class UserMouldVideoController extends BaseController { if(mouldVideo == null || !mouldVideo.getUserId().equals(getMemberId())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到用户数据"); } + if(mouldVideo.getPersonMouldId() != null){ + mouldVideo.setPersonMould(mouldPatchService.getDetailById(mouldVideo.getPersonMouldId())); + } + if(mouldVideo.getVoiceMouldId() != null){ + mouldVideo.setVoiceMould(mouldPatchService.getDetailById(mouldVideo.getVoiceMouldId())); + } + if(mouldVideo.getBackgroundMouldId() != null){ + mouldVideo.setBackgroundMould(mouldPatchService.getDetailById(mouldVideo.getBackgroundMouldId())); + } return new ResultData(mouldVideo); } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java index a8c180c..84e7f5d 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java @@ -73,7 +73,9 @@ public class MouldPatch extends TenantEntity { if(StringUtils.isNotBlank(this.getSceneSign())){ try{ List longs = JSONObject.parseArray(this.getSceneSign(), Long.class); - return longs; + if(longs != null && longs.size() > 0){ + return longs; + } }catch(Exception e){ } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java index 16ec6cb..5a29de3 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java @@ -42,16 +42,24 @@ public class UserMouldVideo extends TenantEntity { private Long personMouldId; @io.swagger.annotations.ApiModelProperty(value="人物模板文件",name="personMouldPath") private String personMouldPath; + @TableField(exist = false) + private MouldPatch personMould; + @io.swagger.annotations.ApiModelProperty(value="声音模板ID",name="voiceMouldId") private Long voiceMouldId; @io.swagger.annotations.ApiModelProperty(value="声音模板文件",name="voiceMouldPath") private String voiceMouldPath; + @TableField(exist = false) + private MouldPatch voiceMould; + @io.swagger.annotations.ApiModelProperty(value="文案",name="paperwork") private String paperwork; @io.swagger.annotations.ApiModelProperty(value="背景模板ID",name="backgroundMouldId") - private String backgroundMouldId; + private Long backgroundMouldId; @io.swagger.annotations.ApiModelProperty(value="背景模板文件",name="backgroundMouldPath") private String backgroundMouldPath; + @TableField(exist = false) + private MouldPatch backgroundMould; @io.swagger.annotations.ApiModelProperty(value="名称",name="title") private String title; diff --git a/suimangService/src/main/java/com/iformall/service/sm/MouldPatchService.java b/suimangService/src/main/java/com/iformall/service/sm/MouldPatchService.java index cea39df..c4e1e8e 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/MouldPatchService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/MouldPatchService.java @@ -35,6 +35,7 @@ public interface MouldPatchService { * @return */ MouldPatch getById(Long id); + MouldPatch getDetailById(Long id); /** * 保存或更新实体 @@ -51,4 +52,5 @@ public interface MouldPatchService { void deleteById(Long id); void updateOnline(MouldPatch record); + } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/MouldPatchServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/MouldPatchServiceImpl.java index 5d3aef9..5ab4656 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/MouldPatchServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/MouldPatchServiceImpl.java @@ -6,12 +6,15 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.sm.MouldPatch; +import com.iformall.domain.po.sm.MouldPatchSign; +import com.iformall.enums.EnumColour; import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumMouldSendType; import com.iformall.enums.EnumaMouldPatchStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.sm.MouldPatchService; +import com.iformall.service.sm.MouldPatchSignService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,6 +32,9 @@ public class MouldPatchServiceImpl implements MouldPatchService { @Autowired MouldPatchMapper mouldPatchMapper; + @Autowired + MouldPatchSignService mouldPatchSignService; + @Override public PageInfo listAsPage(MouldPatch record, Integer pageIndex, Integer pageSize) { @@ -45,6 +51,21 @@ public class MouldPatchServiceImpl implements MouldPatchService { return mouldPatchMapper.selectById(id); } + @Override + public MouldPatch getDetailById(Long id) { + MouldPatch mouldPatch = getById(id); + if(mouldPatch.getSceneSignList() != null && !mouldPatch.getSceneSignList().isEmpty()){ + MouldPatchSign signQ = new MouldPatchSign(); + signQ.setIds(mouldPatch.getSceneSignList()); + List signList = mouldPatchSignService.getList(signQ); + mouldPatch.setMouldPatchSign(signList); + } + if(mouldPatch.getColour() != null){ + mouldPatch.setColourStr(EnumColour.getEnum(mouldPatch.getColour()).getMessage()); + } + return mouldPatch; + } + @Override public ResultData saveOrUpdate(MouldPatch record) { //金额处理