| @@ -8,11 +8,13 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.sm.PhotoSpeakVideo; | import com.iformall.domain.po.sm.PhotoSpeakVideo; | ||||
| import com.iformall.domain.po.sm.UserMouldVideo; | import com.iformall.domain.po.sm.UserMouldVideo; | ||||
| import com.iformall.domain.po.sm.VoiceInfo; | |||||
| import com.iformall.enums.EnumVideoStatus; | import com.iformall.enums.EnumVideoStatus; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.sm.MouldPatchService; | import com.iformall.service.sm.MouldPatchService; | ||||
| import com.iformall.service.sm.PhotoSpeakVideoService; | import com.iformall.service.sm.PhotoSpeakVideoService; | ||||
| import com.iformall.service.sm.UserMouldVideoService; | import com.iformall.service.sm.UserMouldVideoService; | ||||
| import com.iformall.service.sm.VoiceInfoService; | |||||
| import com.iformall.video.VideoFactory; | import com.iformall.video.VideoFactory; | ||||
| import com.iformall.video.entity.VideUploadResult; | import com.iformall.video.entity.VideUploadResult; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| @@ -50,6 +52,9 @@ public class PhotoSpeakVideoController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private MouldPatchService mouldPatchService; | private MouldPatchService mouldPatchService; | ||||
| @Autowired | |||||
| private VoiceInfoService voiceInfoService; | |||||
| @Autowired | @Autowired | ||||
| private VideoFactory videoFactory; | private VideoFactory videoFactory; | ||||
| @@ -82,6 +87,10 @@ public class PhotoSpeakVideoController extends BaseController { | |||||
| if(photoSpeakVideo == null || !photoSpeakVideo.getUserId().equals(getMemberId())){ | if(photoSpeakVideo == null || !photoSpeakVideo.getUserId().equals(getMemberId())){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到用户数据"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到用户数据"); | ||||
| } | } | ||||
| if(photoSpeakVideo.getVoiceMouldId() != null){ | |||||
| VoiceInfo voiceInfo = voiceInfoService.getById(photoSpeakVideo.getVoiceMouldId()); | |||||
| photoSpeakVideo.setVoiceInfo(voiceInfo); | |||||
| } | |||||
| return new ResultData(photoSpeakVideo); | return new ResultData(photoSpeakVideo); | ||||
| } | } | ||||
| @@ -1,8 +1,11 @@ | |||||
| package com.iformall.domain.po.sm; | package com.iformall.domain.po.sm; | ||||
| import com.alibaba.fastjson.JSONObject; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.enums.EnumPersonType; | |||||
| import com.iformall.enums.EnumSpeakType; | |||||
| import com.iformall.sm.AiVideoHelper; | import com.iformall.sm.AiVideoHelper; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -75,7 +78,18 @@ public class PhotoSpeakVideo extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="声音模板",name="voiceMouldSm") | @io.swagger.annotations.ApiModelProperty(value="声音模板",name="voiceMouldSm") | ||||
| private String voiceMouldSm; | private String voiceMouldSm; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private VoiceMould voiceMould; | |||||
| private VoiceInfo voiceInfo; | |||||
| public String getSpeakTypeStr(){ | |||||
| if(StringUtils.isNotBlank(this.voiceMouldSm)){ | |||||
| try{ | |||||
| JSONObject personMouldObject = JSONObject.parseObject(this.voiceMouldSm); | |||||
| Integer speakType = personMouldObject.getInteger("speakType"); | |||||
| this.speakTypeStr = EnumSpeakType.getEnum(speakType).getMessage(); | |||||
| }catch(Exception e){} | |||||
| } | |||||
| return speakTypeStr; | |||||
| } | |||||
| @io.swagger.annotations.ApiModelProperty(value="文案",name="paperwork") | @io.swagger.annotations.ApiModelProperty(value="文案",name="paperwork") | ||||
| private String paperwork; | private String paperwork; | ||||
| @@ -105,9 +105,9 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { | |||||
| voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); | voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); | ||||
| voiceMouldObject.put("sex",voiceMould.getSex()); | voiceMouldObject.put("sex",voiceMould.getSex()); | ||||
| voiceMouldObject.put("personType",0); | voiceMouldObject.put("personType",0); | ||||
| voiceMouldObject.put("personTypeStr","默认"); | |||||
| voiceMouldObject.put("personTypeStr","default"); | |||||
| voiceMouldObject.put("speakType",0); | voiceMouldObject.put("speakType",0); | ||||
| voiceMouldObject.put("speakTypeStr","默认"); | |||||
| voiceMouldObject.put("speakTypeStr","default"); | |||||
| if(StringUtils.isNotBlank(record.getSpeakTypeStr())){ | if(StringUtils.isNotBlank(record.getSpeakTypeStr())){ | ||||
| EnumSpeakType speakType = EnumSpeakType.getEnumByMsg(record.getSpeakTypeStr()); | EnumSpeakType speakType = EnumSpeakType.getEnumByMsg(record.getSpeakTypeStr()); | ||||
| if(speakType == null){ | if(speakType == null){ | ||||
| @@ -160,9 +160,9 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | |||||
| voiceMouldObject.put("title",voiceMould.getTitle()); | voiceMouldObject.put("title",voiceMould.getTitle()); | ||||
| voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); | voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); | ||||
| voiceMouldObject.put("personType",0); | voiceMouldObject.put("personType",0); | ||||
| voiceMouldObject.put("personTypeStr","默认"); | |||||
| voiceMouldObject.put("personTypeStr","default"); | |||||
| voiceMouldObject.put("speakType",0); | voiceMouldObject.put("speakType",0); | ||||
| voiceMouldObject.put("speakTypeStr","默认"); | |||||
| voiceMouldObject.put("speakTypeStr","default"); | |||||
| if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){ | if(EnumVoiceType.person.getCode().equals(voiceMould.getVoiceType())){ | ||||
| voiceMouldObject.put("personType",voiceMould.getPersonType()); | voiceMouldObject.put("personType",voiceMould.getPersonType()); | ||||
| voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr()); | voiceMouldObject.put("personTypeStr",voiceMould.getPersonTypeStr()); | ||||