From b41a6efe17ba61d150c5a9b7309651cebae54e0d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 九月 2021 16:40:43 +0800
Subject: [PATCH] 韩迷TV相关bug修改，电视直播完善（后台+前端API）
---
src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 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 ccd2e07..e070f78 100644
--- a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
@@ -1,30 +1,29 @@
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.hanmi.HanmiUtil;
+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.FunTV2Service;
-import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service;
-import com.yeshi.buwan.service.inter.juhe.MogoTVService;
-import com.yeshi.buwan.service.inter.juhe.YouKuService;
-import com.yeshi.buwan.sohu.SoHuUtil;
+import com.yeshi.buwan.service.inter.juhe.*;
+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;
@@ -79,6 +78,21 @@
@Resource
private MogoTVService mogoTVService;
+
+ @Resource
+ private TencentVideoService tencentVideoService;
+
+ @Resource
+ private TencentVideoUtil tencentVideoUtil;
+
+ @Resource
+ private BilibiliVideoService bilibiliVideoService;
+
+ @Resource
+ private HanmiService hanmiService;
+
+ @Resource
+ private BilibiliUtil bilibiliUtil;
@SuppressWarnings("unchecked")
// @Cacheable(value = "homeCache", key = "'getVideoInfo'+'-'+#videoid+'-'+#resourceId+'-'+#cacheMD5")
@@ -218,6 +232,12 @@
return youKuService.getVideoDetailList(videoid, page, pageSize);
case MogoTVUtil.RESOURCE_ID:
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);
+ case HanmiUtil.RESOURCE_ID:
+ return hanmiService.getVideoDetailList(videoid, page, pageSize);
default:
return null;
}
@@ -241,6 +261,8 @@
return soHuService.getLatestVideoDetail(videoid);
case MogoTVUtil.RESOURCE_ID:
return soHuService.getLatestVideoDetail(videoid);
+ case HanmiUtil.RESOURCE_ID:
+ return hanmiService.getLatestVideoDetail(videoid);
default:
return null;
}
@@ -261,14 +283,28 @@
return soHuUtil.getShowType(videoid);
case YouKuUtil.RESOURCE_ID:
return soHuUtil.getShowType(videoid);
+ case HanmiUtil.RESOURCE_ID:
+ return hanmiService.getShowType(videoid);
default:
return 1;
}
}
+ @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);
@@ -284,6 +320,14 @@
return videoInfoService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
case YouKuUtil.RESOURCE_ID:
return youKuUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ case MogoTVUtil.RESOURCE_ID:
+ 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);
+ case HanmiUtil.RESOURCE_ID:
+ return hanmiService.getPlayUrl(detailSystemId, resourceid, id, videoid);
default:
return null;
}
--
Gitblit v1.8.0