easegen-front/src/views/digitalcourse/digitalhumans/AuditForm.vue
@@ -16,7 +16,7 @@ <el-form-item :label="t('digitalhumans.picture')" v-if="formData.useModel == 1" prop="pictureUrl"> <UploadImg disabled v-model="formData.pictureUrl" /> </el-form-item> <el-form-item v-if="formData.useModel == 2 || formData.useModel == 3" :label="t('digitalhumans.video')" prop="videoUrl"> <el-form-item v-if="(formData.useModel == 2 || formData.useModel == 3) && !(formData.videoUrl || formData.fixVideoUrl) " :label="t('digitalhumans.video')" prop="videoUrl"> <UploadFile v-if="!(formData.videoUrl || formData.fixVideoUrl)" v-model="formData.videoUrl" :fileType="['mp4']" :limit="1" @on-success="handleFileSuccess('fixVideoUrl', $event)"/> @@ -76,7 +76,7 @@ <!-- 下面的是原本的 --> <!-- <video-player v-if="formData.fixVideoUrl" :property="videoProperty"/> --> <!-- 下面的是针对mov新加的 --> <VideoPlayerMov v-if="formData.fixVideoUrl" :property="videoProperty"/> <!-- <VideoPlayerMov v-if="formData.fixVideoUrl" :property="videoProperty"/> --> </el-form-item> <el-form-item v-if="formData.status == 0" :label="t('digitalhumans.expireDate')"> <el-date-picker yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/voices/vo/VoicesSaveReqVO.java
@@ -21,7 +21,6 @@ private String code; @Schema(description = "试听URL", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "试听URL不能为空") private String auditionUrl; @Schema(description = "头像URL", requiredMode = Schema.RequiredMode.REQUIRED) @@ -29,7 +28,6 @@ private String avatarUrl; @Schema(description = "语言类型", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "语言类型不能为空") private String language; @Schema(description = "性别") @@ -42,7 +40,6 @@ private Integer quality; @Schema(description = "声音类型 ", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotNull(message = "声音类型 不能为空") private Integer voiceType; @Schema(description = "状态 (0: 正常, 1: 待审核，2：已受理，3：训练中，4：不通过，5：训练失败)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @@ -54,4 +51,4 @@ @Schema(description = "克隆类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer type; } } yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/coursemedia/CourseMediaMapper.java
@@ -3,6 +3,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; import cn.iocoder.yudao.module.digitalcourse.controller.admin.coursemedia.vo.CourseMediaPageReqVO; import cn.iocoder.yudao.module.digitalcourse.dal.dataobject.coursemedia.CourseMediaDO; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -21,6 +22,7 @@ public interface CourseMediaMapper extends BaseMapperX<CourseMediaDO> { default PageResult<CourseMediaDO> selectPage(CourseMediaPageReqVO reqVO) { Long loginUserId = WebFrameworkUtils.getLoginUserId(); return selectPage(reqVO, new LambdaQueryWrapperX<CourseMediaDO>() .eqIfPresent(CourseMediaDO::getStatus, reqVO.getStatus()) .betweenIfPresent(CourseMediaDO::getCreateTime, reqVO.getCreateTime()) @@ -33,6 +35,7 @@ .eqIfPresent(CourseMediaDO::getCourseId, reqVO.getCourseId()) .likeIfPresent(CourseMediaDO::getCourseName, reqVO.getCourseName()) .eqIfPresent(CourseMediaDO::getCreator, reqVO.getCreator()) .apply(loginUserId != 1, "creator = {0}", loginUserId) .orderByDesc(CourseMediaDO::getId)); } @@ -42,4 +45,4 @@ List<CourseMediaDO> selectByIdAndStatusList(@Param("id") Long id,@Param("status") List<Integer> status); Integer lockPoint(@Param("userId") Long userId, @Param("status") List<Integer> status); } } yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/coursemedia/CourseMediaServiceImpl.java
@@ -84,7 +84,7 @@ public PageResult<CourseMediaDO> getCourseMediaPage(CourseMediaPageReqVO pageReqVO) { PageResult<CourseMediaDO> courseMediaDOPageResult = courseMediaMapper.selectPage(pageReqVO); for (CourseMediaDO courseMediaDO : courseMediaDOPageResult.getList()) { if (courseMediaDO.getStatus() == 1) { if (courseMediaDO.getStatus() == 1 || courseMediaDO.getStatus() == 0) { //视频合成中 查询排队和合成进度 Long id = courseMediaDO.getCourseId(); int pos = mediaTaskManager.getQueuePosition(id);
