From facda03795167f2c949cc5327233aacc534310e8 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Fri, 27 Oct 2023 15:56:49 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=A7=86=E9=A2=91api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/ai/AiVideoController.java | 5 +++-- .../main/java/com/iformall/service/AiVideoService.java | 2 +- .../com/iformall/service/impl/AiVideoServiceImpl.java | 4 ++-- .../service/sm/impl/UserMouldVideoServiceImpl.java | 3 ++- .../src/main/java/com/iformall/sm/AiVideoHelper.java | 10 +++++++--- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java b/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java index 470ba4b..ff1d3d0 100644 --- a/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java +++ b/open-api/src/main/java/com/iformall/controller/ai/AiVideoController.java @@ -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())); } } diff --git a/open-api/src/main/java/com/iformall/service/AiVideoService.java b/open-api/src/main/java/com/iformall/service/AiVideoService.java index 16577f8..63e6757 100644 --- a/open-api/src/main/java/com/iformall/service/AiVideoService.java +++ b/open-api/src/main/java/com/iformall/service/AiVideoService.java @@ -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); } diff --git a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java index ea4d7ef..df53e86 100644 --- a/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java +++ b/open-api/src/main/java/com/iformall/service/impl/AiVideoServiceImpl.java @@ -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() diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 9cd8881..4917271 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -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()+""); diff --git a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java index b3df8fb..279a812 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java @@ -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));