From 8fee151ffae0c3818694b7318583814bf92663e2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 八月 2021 18:52:28 +0800
Subject: [PATCH] 聚合视频资源包调整，接入韩迷
---
src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
index 66d2803..eeed072 100644
--- a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
@@ -1,28 +1,28 @@
package com.yeshi.buwan.util.video;
-import com.yeshi.buwan.acFun.AcFunUtil;
+import com.yeshi.buwan.videos.acFun.AcFunUtil;
import com.yeshi.buwan.dao.VideoInfoDao;
-import com.yeshi.buwan.domain.ResourceVideo;
-import com.yeshi.buwan.domain.VideoDetailInfo;
-import com.yeshi.buwan.domain.VideoInfo;
-import com.yeshi.buwan.domain.VideoResource;
+import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.funtv.FunTVUtil;
-import com.yeshi.buwan.funtv.FunTVUtil2;
-import com.yeshi.buwan.iqiyi.util.IqiyiUtil;
-import com.yeshi.buwan.iqiyi.util.IqiyiUtil2;
-import com.yeshi.buwan.mogotv.MogoTVUtil;
+import com.yeshi.buwan.videos.funtv.FunTVUtil;
+import com.yeshi.buwan.videos.funtv.FunTVUtil2;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil2;
+import com.yeshi.buwan.videos.mogotv.MogoTVUtil;
import com.yeshi.buwan.service.imp.VideoInfoService;
+import com.yeshi.buwan.service.imp.VideoResourceService;
import com.yeshi.buwan.service.imp.juhe.FunTVService;
import com.yeshi.buwan.service.imp.juhe.IqiyiService;
import com.yeshi.buwan.service.imp.juhe.SoHuService;
import com.yeshi.buwan.service.inter.juhe.*;
-import com.yeshi.buwan.sohu.SoHuUtil;
-import com.yeshi.buwan.tencent.TencentVideoUtil;
+import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
+import com.yeshi.buwan.videos.sohu.SoHuUtil;
+import com.yeshi.buwan.videos.tencent.TencentVideoUtil;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.log.VideoLogFactory;
+import com.yeshi.buwan.videos.bilibili.BilibiliUtil;
import com.yeshi.buwan.vo.AcceptData;
-import com.yeshi.buwan.youku.YouKuUtil;
+import com.yeshi.buwan.videos.youku.YouKuUtil;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.slf4j.Logger;
@@ -83,6 +83,12 @@
@Resource
private TencentVideoUtil tencentVideoUtil;
+
+ @Resource
+ private BilibiliVideoService bilibiliVideoService;
+
+ @Resource
+ private BilibiliUtil bilibiliUtil;
@SuppressWarnings("unchecked")
// @Cacheable(value = "homeCache", key = "'getVideoInfo'+'-'+#videoid+'-'+#resourceId+'-'+#cacheMD5")
@@ -224,6 +230,8 @@
return mogoTVService.getVideoDetailList(videoid, page, pageSize);
case TencentVideoUtil.RESOURCE_ID:
return tencentVideoService.getVideoDetailList(videoid, page, pageSize);
+ case BilibiliUtil.RESOURCE_ID:
+ return bilibiliVideoService.getVideoDetailList(videoid, page, pageSize);
default:
return null;
}
@@ -272,9 +280,21 @@
}
}
+ @Resource
+ private SolrShortVideoDataManager solrShortVideoDataManager;
+
+ @Resource
+ private VideoResourceService videoResourceService;
+
+
@Cacheable(value = "homeCache", key = "'getPlayUrl'+'-'+#detailSystemId+'-'+#id+'-'+#type+'-'+#resourceid")
public PlayUrl getPlayUrl(AcceptData acceptData, String detailSystemId, String id, String type, int resourceid, String videoid) {
playLogger.info(VideoLogFactory.createPlayUrlLog(detailSystemId, id, type, resourceid, videoid));
+ if (VideoUtil.getVideoFromType(id) == HomeVideo.FROM_TYPE_SHORT) {
+ VideoResource vr = videoResourceService.getResource(resourceid + "");
+ return solrShortVideoDataManager.getPlayUrl(id, vr);
+ }
+
switch (resourceid) {
case IqiyiUtil2.RESOURCE_ID:
return iqiyi2Service.getPlayUrl(detailSystemId, resourceid, id, videoid);
@@ -294,6 +314,8 @@
return mogoTVUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
case TencentVideoUtil.RESOURCE_ID:
return tencentVideoUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ case BilibiliUtil.RESOURCE_ID:
+ return bilibiliUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
default:
return null;
}
--
Gitblit v1.8.0