| @@ -92,6 +92,12 @@ public class UserMouldVideoController extends BaseController { | |||
| if(mouldVideo == null || !mouldVideo.getUserId().equals(getMemberId())){ | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到用户数据"); | |||
| } | |||
| if(EnumVideoStatus.ing.getCode().equals(mouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_ing.getCode().equals(mouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_fail.getCode().equals(mouldVideo.getVideoStatus())){ | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频生成中"); | |||
| } | |||
| userMouldVideoService.deleteById(id); | |||
| return new ResultData(); | |||
| } | |||
| @@ -106,14 +112,14 @@ public class UserMouldVideoController extends BaseController { | |||
| if(userMouldVideo == null){ | |||
| return new ResultData(ErrorCode.SYS_SERVER_ERROR); | |||
| } | |||
| if(EnumVideoStatus.ing.getCode().equals(userMouldVideo.getVideoStatus())){ | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频生成中"); | |||
| } | |||
| if(EnumVideoStatus.success.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| if(EnumVideoStatus.ing.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.success.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_ing.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_success.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_fail.getCode().equals(userMouldVideo.getVideoStatus())){ | |||
| //上传阿里云状态 都是生成成功 | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频生成中"); | |||
| } | |||
| if(EnumVideoStatus.upload_success.getCode().equals(userMouldVideo.getVideoStatus())){ | |||
| //上传阿里云状态 生成成功 | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频已生成完成"); | |||
| } | |||
| } | |||
| @@ -140,13 +146,15 @@ public class UserMouldVideoController extends BaseController { | |||
| if(StringUtils.isEmpty(mouldVideo.getPaperwork())){ | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未填写视频文案"); | |||
| } | |||
| if(!EnumVideoStatus.draft.getCode().equals(mouldVideo.getVideoStatus()) | |||
| && !EnumVideoStatus.fail.getCode().equals(mouldVideo.getVideoStatus())){ | |||
| if(EnumVideoStatus.ing.getCode().equals(mouldVideo.getVideoStatus())){ | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频生成中"); | |||
| }else{ | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频已生成完成"); | |||
| } | |||
| if(EnumVideoStatus.ing.getCode().equals(mouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_ing.getCode().equals(mouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_fail.getCode().equals(mouldVideo.getVideoStatus())){ | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频生成中"); | |||
| } | |||
| if(EnumVideoStatus.upload_success.getCode().equals(mouldVideo.getVideoStatus())){ | |||
| //上传阿里云状态 生成成功 | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"视频已生成完成"); | |||
| } | |||
| UserMouldVideo mouldVideoUpd = new UserMouldVideo(); | |||
| @@ -167,12 +175,12 @@ public class UserMouldVideoController extends BaseController { | |||
| public ResultData findVideo(Long id) { | |||
| logger.debug("[" + getIpAddr() + "] MouldPatchController::findVideo"); | |||
| UserMouldVideo userMouldVideo = userMouldVideoService.findVideo(id); | |||
| if(EnumVideoStatus.upload_ing.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_success.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| || EnumVideoStatus.upload_fail.getCode().equals(userMouldVideo.getVideoStatus())){ | |||
| //上传阿里云状态 都是生成成功 | |||
| userMouldVideo.setVideoStatus(EnumVideoStatus.success.getCode()); | |||
| } | |||
| // if(EnumVideoStatus.upload_ing.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| // || EnumVideoStatus.upload_success.getCode().equals(userMouldVideo.getVideoStatus()) | |||
| // || EnumVideoStatus.upload_fail.getCode().equals(userMouldVideo.getVideoStatus())){ | |||
| // //上传阿里云状态 都是生成成功 | |||
| // userMouldVideo.setVideoStatus(EnumVideoStatus.success.getCode()); | |||
| // } | |||
| return new ResultData(userMouldVideo); | |||
| } | |||