From 6316689091d045c4cb3945df4e5a943e9c48b8f7 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Fri, 20 Oct 2023 17:53:58 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B7=AF=E5=BE=84=E4=BB=A5=E5=8F=8A=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ai/AiVideoController.java | 2 +- .../service/impl/AiVideoServiceImpl.java | 42 ------------------- .../com/iformall/common/CommonConstant.java | 6 +-- .../iformall/domain/po/sm/ServiceInfo.java | 2 +- 4 files changed, 5 insertions(+), 47 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 af542c2..470ba4b 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 @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "视频相关api") @RestController -@RequestMapping("/ai/video") +@RequestMapping("/api/video") public class AiVideoController extends BaseController { @Autowired 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 19ba4c7..3c6c992 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 @@ -1,24 +1,12 @@ package com.iformall.service.impl; -import com.iformall.common.ErrorCode; import com.iformall.domain.dto.neuver.SaveServiceVideoRecordDTO; -import com.iformall.domain.po.sm.UserMouldVideo; -import com.iformall.dto.GenerateVideoDTO; -import com.iformall.dto.PreviewVideoDTO; -import com.iformall.enums.EnumVideoStatus; -import com.iformall.exception.BizException; import com.iformall.service.AiVideoService; import com.iformall.service.sm.ServiceVideoRecordService; -import com.iformall.service.sm.UserMouldVideoService; -import com.iformall.service.sm.VoiceInfoService; import com.iformall.sm.*; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.Optional; - /** * ai视频服务 * @@ -28,8 +16,6 @@ import java.util.Optional; @Service public class AiVideoServiceImpl implements AiVideoService { - @Autowired - private UserMouldVideoService userMouldVideoService; @Autowired private ServiceVideoRecordService serviceVideoRecordService; @@ -40,25 +26,6 @@ public class AiVideoServiceImpl implements AiVideoService { @Override public AiVideoResult generateVideo(AiVideoParam aiVideoParam, Long taskId, Long serviceId) { -// // 参数校验 -// UserMouldVideo userMouldVideo = Optional.ofNullable(userMouldVideoService.getById(dto.getId())).orElseThrow(() -> new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未找到用户数据")); -// if (StringUtils.isBlank(userMouldVideo.getPaperwork())) { -// throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未填写视频文案"); -// } -// if (EnumVideoStatus.ing.getCode().equals(userMouldVideo.getVideoStatus()) -// || EnumVideoStatus.success.getCode().equals(userMouldVideo.getVideoStatus()) -// || EnumVideoStatus.upload_ing.getCode().equals(userMouldVideo.getVideoStatus()) -// || EnumVideoStatus.upload_fail.getCode().equals(userMouldVideo.getVideoStatus())) { -// throw new BizException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "视频生成中"); -// } -// if (EnumVideoStatus.upload_success.getCode().equals(userMouldVideo.getVideoStatus())) { -// throw new BizException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "视频已生成完成"); -// } -// -// // 更新视频信息 -// updateUserMouldVideo(userMouldVideo); -// userMouldVideoService.createVideo(userMouldVideo); - AiVideoResult video = AiVideoHelper.createVideo(aiVideoParam, taskId); if (video.isSuccess()) { // 记录时长 @@ -70,13 +37,4 @@ public class AiVideoServiceImpl implements AiVideoService { } return video; } - - private void updateUserMouldVideo(UserMouldVideo userMouldVideo) { - UserMouldVideo video = new UserMouldVideo(); - video.setId(userMouldVideo.getId()); - video.setVideoStatus(EnumVideoStatus.ing.getCode()); - video.setVideoMsg(""); - video.setCreateVideoDate(new Date()); - userMouldVideoService.updateById(video); - } } diff --git a/suimangService/src/main/java/com/iformall/common/CommonConstant.java b/suimangService/src/main/java/com/iformall/common/CommonConstant.java index 89558e5..8f4d0da 100644 --- a/suimangService/src/main/java/com/iformall/common/CommonConstant.java +++ b/suimangService/src/main/java/com/iformall/common/CommonConstant.java @@ -2,10 +2,10 @@ package com.iformall.common; public interface CommonConstant { /** - * 状态(0:锁定,1:正常) + * 状态(0:正常,1:锁定) */ - Integer STATUS_NORMAL = 1; - Integer STATUS_ABNORMAL = 0; + Integer STATUS_NORMAL = 0; + Integer STATUS_ABNORMAL = 1; /** * 删除状态(0:未删除,1:已删除) diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java index 76751c8..e654ccc 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java @@ -54,7 +54,7 @@ public class ServiceInfo { @TableField("type") private Integer type; /** - * 状态(0:锁定,1:正常) + * 状态(0:正常,1:锁定) */ @TableField("status") private Integer status;