瀏覽代碼

//..

private_deployment
xhxu 2 年之前
父節點
當前提交
0378e32688
共有 5 個文件被更改,包括 52 次插入3 次删除
  1. +2
    -0
      suimangService/src/main/java/com/iformall/service/sm/VoiceInfoService.java
  2. +2
    -0
      suimangService/src/main/java/com/iformall/service/sm/VoiceMaterialService.java
  3. +14
    -3
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java
  4. +5
    -0
      suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java
  5. +29
    -0
      suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java

+ 2
- 0
suimangService/src/main/java/com/iformall/service/sm/VoiceInfoService.java 查看文件

@@ -10,4 +10,6 @@ import java.util.List;
public interface VoiceInfoService { public interface VoiceInfoService {


List<VoiceInfo> chooseType(Long id); List<VoiceInfo> chooseType(Long id);

VoiceInfo getById(Long voiceMouldId);
} }

+ 2
- 0
suimangService/src/main/java/com/iformall/service/sm/VoiceMaterialService.java 查看文件

@@ -42,4 +42,6 @@ public interface VoiceMaterialService {


void updateOnline(VoiceMaterial record); void updateOnline(VoiceMaterial record);


void handVideoUrl(VoiceMaterial record);

} }

+ 14
- 3
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java 查看文件

@@ -45,6 +45,9 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
@Autowired @Autowired
MaterialMouldService materialMouldService; MaterialMouldService materialMouldService;


@Autowired
VoiceInfoService voiceInfoService;

@Autowired @Autowired
VideoFactory videoFactory; VideoFactory videoFactory;


@@ -86,13 +89,14 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
if(record.getVoiceMouldId() == null){ if(record.getVoiceMouldId() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未选择声音模板信息"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未选择声音模板信息");
} }
VoiceMould voiceMould = voiceMouldService.getById(record.getVoiceMouldId());
VoiceInfo voiceMould = voiceInfoService.getById(record.getVoiceMouldId());
// VoiceMould voiceMould = voiceMouldService.getById(record.getVoiceMouldId());
if(voiceMould == null){ if(voiceMould == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音模板信息"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音模板信息");
} }


JSONObject voiceMouldObject = new JSONObject(); JSONObject voiceMouldObject = new JSONObject();
voiceMouldObject.put("title",voiceMould.getTitle());
voiceMouldObject.put("title",voiceMould.getLocalName());
voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId());
voiceMouldObject.put("personType",0); voiceMouldObject.put("personType",0);
voiceMouldObject.put("personTypeStr","默认"); voiceMouldObject.put("personTypeStr","默认");
@@ -101,7 +105,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
if(StringUtils.isNotBlank(record.getSpeakTypeStr())){ if(StringUtils.isNotBlank(record.getSpeakTypeStr())){
EnumSpeakType speakType = EnumSpeakType.getEnum(record.getSpeakTypeStr()); EnumSpeakType speakType = EnumSpeakType.getEnum(record.getSpeakTypeStr());
if(speakType == null){ if(speakType == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音类型信息");
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"声音类型信息错误");
} }
voiceMouldObject.put("speakType",speakType.getCode()); voiceMouldObject.put("speakType",speakType.getCode());
voiceMouldObject.put("speakTypeStr",speakType.getMessage()); voiceMouldObject.put("speakTypeStr",speakType.getMessage());
@@ -115,6 +119,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
if(voiceMaterial == null){ if(voiceMaterial == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音文件"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到声音文件");
} }
voiceMaterialService.handVideoUrl(voiceMaterial);
record.setVoiceMaterialUrl(voiceMaterial.getMaterial()); record.setVoiceMaterialUrl(voiceMaterial.getMaterial());
} }
} }
@@ -183,6 +188,12 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
} }
}else if(EnumVoiceFrom.FROM_UPD.getCode().equals(voiceFrom)){ }else if(EnumVoiceFrom.FROM_UPD.getCode().equals(voiceFrom)){
voiceMaterialUrl = photoSpeakVideo.getVoiceMaterialUrl(); voiceMaterialUrl = photoSpeakVideo.getVoiceMaterialUrl();
if(StringUtils.isBlank(voiceMaterialUrl)){
VoiceMaterial voiceMaterial = voiceMaterialService.getById(photoSpeakVideo.getVoiceMaterialId());
voiceMaterialService.handVideoUrl(voiceMaterial);
voiceMaterialUrl = voiceMaterial.getMaterial();
videoUpd.setVoiceMaterialUrl(voiceMaterialUrl);
}
if(StringUtils.isBlank(voiceMaterialUrl)){ if(StringUtils.isBlank(voiceMaterialUrl)){
msg = "未找到上传声音文件"; msg = "未找到上传声音文件";
} }


+ 5
- 0
suimangService/src/main/java/com/iformall/service/sm/impl/VoiceInfoServiceImpl.java 查看文件

@@ -32,4 +32,9 @@ public class VoiceInfoServiceImpl implements VoiceInfoService {
}); });
return voiceInfos; return voiceInfos;
} }

@Override
public VoiceInfo getById(Long voiceMouldId) {
return voiceMapper.selectById(voiceMouldId);
}
} }

+ 29
- 0
suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java 查看文件

@@ -8,10 +8,13 @@ import com.iformall.domain.po.sm.MouldPatchSign;
import com.iformall.domain.po.sm.PersonPhoto; import com.iformall.domain.po.sm.PersonPhoto;
import com.iformall.domain.po.sm.VoiceMaterial; import com.iformall.domain.po.sm.VoiceMaterial;
import com.iformall.enums.EnumMouldSendType; import com.iformall.enums.EnumMouldSendType;
import com.iformall.enums.EnumVideoStatus;
import com.iformall.enums.EnumaMouldPatchStatus; import com.iformall.enums.EnumaMouldPatchStatus;
import com.iformall.mapper.VoiceMaterialMapper; import com.iformall.mapper.VoiceMaterialMapper;
import com.iformall.service.sm.MouldPatchSignService; import com.iformall.service.sm.MouldPatchSignService;
import com.iformall.service.sm.VoiceMaterialService; import com.iformall.service.sm.VoiceMaterialService;
import com.iformall.video.VideoFactory;
import com.iformall.video.entity.VideUploadResult;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -33,6 +36,12 @@ public class VoiceMaterialServiceImpl implements VoiceMaterialService {
@Autowired @Autowired
MouldPatchSignService mouldPatchSignService; MouldPatchSignService mouldPatchSignService;


@Autowired
VideoFactory videoFactory;

@Autowired
String videoType;

private void handleSendType(VoiceMaterial record){ private void handleSendType(VoiceMaterial record){
// //
if(record.getUserId() != null){ if(record.getUserId() != null){
@@ -100,6 +109,7 @@ public class VoiceMaterialServiceImpl implements VoiceMaterialService {
record.setUpdateDate(now); record.setUpdateDate(now);
voiceMaterialMapper.updateById(record); voiceMaterialMapper.updateById(record);
} }
handVideoUrl(record);
return new ResultData(record); return new ResultData(record);
} }


@@ -121,4 +131,23 @@ public class VoiceMaterialServiceImpl implements VoiceMaterialService {
voiceMaterialMapper.updateById(voiceMaterialUpd); voiceMaterialMapper.updateById(voiceMaterialUpd);
} }


@Override
public void handVideoUrl(VoiceMaterial record) {
if(StringUtils.isBlank(record.getVideoId()) || StringUtils.isNotBlank(record.getMaterial())){
return;
}

VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVideoId());
if (videoDetail.isSuccess()) {
record.setMaterial(videoDetail.getVideoUrl());
if(record.getId() != null){
VoiceMaterial updM = new VoiceMaterial();
updM.setId(record.getId());
updM.setMaterial(record.getMaterial());
voiceMaterialMapper.updateById(updM);
}
}
}


} }

Loading…
取消
儲存