From 138ccc9fe4798e5335c49a6407e8cdc70e1ff122 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期四, 24 十一月 2022 16:06:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemAudioService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemAudioService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemAudioService.java
index 11d5695..3f4bcca 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemAudioService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemAudioService.java
@@ -2,6 +2,7 @@
import java.util.Date;
+import com.qxueyou.scc.teach.res.model.ResItemVideo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,7 +34,7 @@
String mediaVideoId = addVideoConverTask(file);
ResItemAudio audio = new ResItemAudio();
TraceUtils.setCreateTrace(audio);
-
+ audio.setStatus(ResItemAudio.STATUS_LINEUP);
audio.setFileId(fileId);
audio.setName(name);
audio.setMediaVideoId(mediaVideoId);
@@ -105,7 +106,9 @@
ResItemAudio resItemAudio = read(ResItemAudio.class, resId);
if (resItemAudio != null && resItemAudio.getStatus() != ResItemAudio.STATUS_DRAFT) {
- return null;
+ ResFile resFile = read(ResFile.class,resItemAudio.getFileId());
+ return resFile.getPath();
+ //return null;
}
MediaVideo video = read(MediaVideo.class, resItemAudio.getMediaVideoId());
--
Gitblit v1.8.0