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/ResItemVideoService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java
index de22b0d..61b7c15 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java
@@ -119,7 +119,9 @@
ResItemVideo resItemVideo = read(ResItemVideo.class, resId);
if (resItemVideo != null && resItemVideo.getStatus() != ResItemVideo.STATUS_DRAFT) {
- return null;
+ ResFile resFile = read(ResFile.class,resItemVideo.getFileId());
+ return resFile.getPath();
+// return null;
}
MediaVideo video = read(MediaVideo.class, resItemVideo.getMediaVideoId());
@@ -130,7 +132,7 @@
return JSONObject.toJSONString(CollectionUtils.newObjectMap("hd",video.getAndroidHD(), "sd", video.getAndroidSD(), "ld", video.getAndroidLD(), "path",StringUtils.isNotEmpty(video.getAndroidHD()) ? video.getAndroidHD()
: StringUtils.isNotEmpty(video.getAndroidSD()) ? video.getAndroidSD() : video.getAndroidLD()));
-
+
}
@Override
@@ -149,7 +151,7 @@
if (StringUtils.isBlank(mediaVideoId)) {
return;
}
-
+
MediaVideo mediaVideo = read(MediaVideo.class, mediaVideoId);
if (mediaVideo.getStatus() == MediaVideo.STATUS_DRAFT) {
if (mediaVideo.getType().equals("video")) {
--
Gitblit v1.8.0