浏览代码

//mould

private_deployment
xhxu 2 年前
父节点
当前提交
dde5917acc
共有 6 个文件被更改,包括 49 次插入12 次删除
  1. +2
    -10
      suimangCApi/src/main/java/com/iformall/controller/MouldPatchController.java
  2. +12
    -0
      suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java
  3. +3
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/MouldPatch.java
  4. +9
    -1
      suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java
  5. +2
    -0
      suimangService/src/main/java/com/iformall/service/sm/MouldPatchService.java
  6. +21
    -0
      suimangService/src/main/java/com/iformall/service/sm/impl/MouldPatchServiceImpl.java

+ 2
- 10
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<MouldPatchSign> 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);
}



+ 12
- 0
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);
}



+ 3
- 1
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<Long> longs = JSONObject.parseArray(this.getSceneSign(), Long.class);
return longs;
if(longs != null && longs.size() > 0){
return longs;
}
}catch(Exception e){
}
}


+ 9
- 1
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;


+ 2
- 0
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);

}

+ 21
- 0
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<MouldPatch> 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<MouldPatchSign> 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) {
//金额处理


正在加载...
取消
保存