From e6601bf94b2d1aeda37e92340275e2a81c9ee450 Mon Sep 17 00:00:00 2001
From: Administrator <2863138610@qq.com>
Date: 星期四, 10 十一月 2022 17:40:45 +0800
Subject: [PATCH] 资源管理bug修复中
---
src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemAudioService.java | 7 +++++--
src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java | 9 +++++----
src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java | 5 ++++-
src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java | 8 +++++---
4 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
index d217a6b..2573165 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
@@ -46,7 +46,7 @@
@Autowired
private ApplicationContext appContext;
-
+
@Autowired
private IClassLectureService classLectureService;
@@ -306,8 +306,9 @@
public Result readAccessPath(String resId, String attribute) {
Res res = read(Res.class, resId);
-
- Object path = Res.FILE_TYPE_VIDEO.equals(res.getType())?JSONObject.parse(resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute)):CollectionUtils.newObjectMap("path", resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute));
+
+// Object path = Res.FILE_TYPE_VIDEO.equals(res.getType())? JSONObject.parse(resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute)):CollectionUtils.newObjectMap("path", resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute));
+ Object path = Res.FILE_TYPE_VIDEO.equals(res.getType())? resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute):resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute);
if(Res.FILE_TYPE_DOC.equals(res.getType())) {
return new Result(true, "success",
CollectionUtils.newObjectMap("path", path, "name", res.getName(), "coverPageUrl", res.getCoverPageUrl(), "size",
@@ -316,7 +317,7 @@
return new Result(true, "success",
CollectionUtils.newObjectMap("path", path, "name", res.getName(), "coverPageUrl", res.getCoverPageUrl(), "size", 0));
}
-
+
}
@Override
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());
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
index e74e798..f5f754c 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemDocService.java
@@ -79,6 +79,7 @@
HandoutConverTask task = new HandoutConverTask();
task.setCreateTime(new Date());
+ task.setUpdateTime(new Date());
task.setHandoutId(handout.getHandoutId());
task.setHandoutUrl(handout.getFullPath());
task.setStatus(HandoutConverTask.STATUS_DRAFT);
@@ -107,7 +108,9 @@
public String readAccessPath(String resId, String attribute) {
ResItemDoc resItemDoc = read(ResItemDoc.class, resId);
if (ResItemDoc.STATUS_DRAFT != resItemDoc.getStatus()) {
- return null;
+ ResFile resFile = read(ResFile.class,resItemDoc.getOrigFileId());
+ return resFile.getPath();
+// return null;
}
SchHandout schHandout = read(SchHandout.class, resItemDoc.getHandoutId());
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