From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java b/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java
index 464264d..a4cfb00 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java
@@ -7,11 +7,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.buwan.exception.video.VideoPlayException;
import org.springframework.stereotype.Controller;
-import com.rabbitmq.tools.json.JSONUtil;
import com.yeshi.buwan.domain.CategoryContry;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.VideoDetailInfo;
import com.yeshi.buwan.domain.VideoInfo;
import com.yeshi.buwan.domain.VideoType;
@@ -127,8 +127,8 @@
JSONObject object = new JSONObject();
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(platform, 0);
DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, 1,null);
// 鑾峰彇瑙嗛鍒楄〃
List<VideoInfo> list1;
if (type.equalsIgnoreCase("area")) {
@@ -146,7 +146,7 @@
CacheUtil.getMD5Long(resourceList));
}
- List<VideoInfo> list = new ArrayList<VideoInfo>();
+ List<VideoInfo> list = new ArrayList<>();
list.addAll(list1);
JSONArray array = new JSONArray();
for (VideoInfo info : list)
@@ -198,9 +198,9 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(platform, 0);
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1,null);
- VideoInfo info = (videoDeailUtil.getVideoInfo(videoId, resourceId, resourceList,
+ VideoInfo info = (videoDeailUtil.getVideoInfo(null, videoId, resourceId, resourceList,
CacheUtil.getMD5Long(resourceList)));
if (info == null)
return;
@@ -285,7 +285,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(platform, 0);
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1,null);
DetailSystem ds = systemService.getDetailSystemByPackage(packageName);
// 鐚滀綘鍠滄
@@ -293,19 +293,19 @@
? recommendService.guessLikeList(ds.getId(), 10, resourceList, CacheUtil.getMD5Long(resourceList))
: recommendService.guessLikeList(ds.getId(), 10, videoId, resourceList,
CacheUtil.getMD5Long(resourceList));
- List<VideoInfo> list = new ArrayList<VideoInfo>();
+ List<VideoInfo> list = new ArrayList<>();
list.addAll(list1);
// 鐩稿叧瑙嗛
List<VideoInfo> list2 = recommendService.getRelativeVideoList(ds.getId(), 10, videoId, resourceList,
CacheUtil.getMD5Long(resourceList));
- List<VideoInfo> xlist = new ArrayList<VideoInfo>();
+ List<VideoInfo> xlist = new ArrayList<>();
xlist.addAll(list2);
// 澶у閮藉湪鐪�
List<VideoInfo> list3 = recommendService.peopleSee(ds.getId(), 10, videoId, resourceList,
CacheUtil.getMD5Long(resourceList));
- List<VideoInfo> plist = new ArrayList<VideoInfo>();
+ List<VideoInfo> plist = new ArrayList<>();
plist.addAll(list3);
JSONArray garray = new JSONArray();
JSONArray xarray = new JSONArray();
@@ -379,7 +379,12 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
- PlayUrl pu = videoDeailUtil.getPlayUrl(null, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ PlayUrl pu = null;
+ try {
+ pu = videoDeailUtil.getPlayUrl(null, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ } catch (VideoPlayException e) {
+ e.printStackTrace();
+ }
if (pu != null) {
if (!StringUtil.isNullOrEmpty(pu.getUrl()))
--
Gitblit v1.8.0