Browse Source

feat:修改创建视频api

private_deployment
xmzhao71 1 year ago
parent
commit
facda03795
5 changed files with 15 additions and 9 deletions
  1. +3
    -2
      open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java
  2. +1
    -1
      open-api/src/main/java/com/iformall/service/AiVideoService.java
  3. +2
    -2
      open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java
  4. +2
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java
  5. +7
    -3
      suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java

+ 3
- 2
open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java View File

@@ -5,6 +5,7 @@ import com.iformall.controller.BaseController;
import com.iformall.dto.GenerateVideoDTO;
import com.iformall.dto.PreviewVideoDTO;
import com.iformall.service.AiVideoService;
import com.iformall.sm.AiVideoParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@ public class AiVideoController extends BaseController {

@ApiOperation("生成视频")
@PostMapping("generateVideo")
public ResultData generateVideo(@RequestBody GenerateVideoDTO dto) {
return new ResultData(aiVideoService.generateVideo(dto.getAiVideoParam(), dto.getId(), getServiceId()));
public ResultData generateVideo(@RequestBody AiVideoParam aiVideoParam) {
return new ResultData(aiVideoService.generateVideo(aiVideoParam, getServiceId()));
}
}

+ 1
- 1
open-api/src/main/java/com/iformall/service/AiVideoService.java View File

@@ -23,5 +23,5 @@ public interface AiVideoService {
* @param aiVideoParam
* @return {@link AiVideoResult}
*/
AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId, Long serviceId);
AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long serviceId);
}

+ 2
- 2
open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java View File

@@ -25,8 +25,8 @@ public class AiVideoServiceImpl implements AiVideoService {
}

@Override
public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId, Long serviceId) {
AiVideoResult video = AiVideoHelper.createVideo(aiVideoParam, taskId);
public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long serviceId) {
AiVideoResult video = AiVideoHelper.createVideo(aiVideoParam);
if (video.isSuccess()) {
// 记录时长
SaveServiceVideoRecordDTO dto = SaveServiceVideoRecordDTO.builder()


+ 2
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java View File

@@ -349,6 +349,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {

try{
AiVideoParam videoParam = new AiVideoParam();
videoParam.setTask_id(mouldVideo.getId());
videoParam.setGen_txt(paperwork.replaceAll(Constant.text_pause, "[*]"));
videoParam.setVideo_template_id(personMouldSmId);
videoParam.setSubtitle(subtitleMap);
@@ -391,7 +392,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService {
}
videoParam.setVideo_files(videoFiles);

AiVideoResult video = AiVideoHelper.createVideo(videoParam,mouldVideo.getId());
AiVideoResult video = AiVideoHelper.createVideo(videoParam);
if(video.isSuccess()){
videoUpd.setVideoPath(video.getUrl());
// videoUpd.setVideoTime(video.getDuration()+"");


+ 7
- 3
suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java View File

@@ -61,10 +61,14 @@ public class AiVideoHelper {
}

public static AiVideoResult createVideo(AiVideoParam videoParam,Long taskId) {
public static AiVideoResult createVideo(AiVideoParam videoParam) {

videoParam.setTask_id(taskId);
videoParam.setCallback_url(callbackUrl + "/callback/oral/broadcasting");
// videoParam.setTask_id(taskId);
if (StringUtils.isNotBlank(videoParam.getCallback_url())) {
videoParam.setCallback_url(videoParam.getCallback_url());
} else {
videoParam.setCallback_url(callbackUrl + "/callback/oral/broadcasting");
}

log.info("生成视频start request:" + videoParam.neglectImgString());
log.info("完整参数:{}", JSONObject.toJSONString(videoParam));


Loading…
Cancel
Save