From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容
---
src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 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 841bfca..241f304 100644
--- a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
@@ -11,18 +11,20 @@
import com.yeshi.buwan.funtv.FunTVUtil2;
import com.yeshi.buwan.iqiyi.util.IqiyiUtil;
import com.yeshi.buwan.iqiyi.util.IqiyiUtil2;
-import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.VideoInfoService;
import com.yeshi.buwan.service.imp.juhe.FunTVService;
import com.yeshi.buwan.service.imp.juhe.IqiyiService;
-import com.yeshi.buwan.service.imp.juhe.PPTVService;
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.sohu.SoHuUtil;
import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.log.VideoLogFactory;
+import com.yeshi.buwan.vo.AcceptData;
import org.hibernate.HibernateException;
import org.hibernate.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Component;
@@ -32,6 +34,9 @@
@Component
public class VideoDetailUtil {
+
+ private final Logger playLogger = LoggerFactory.getLogger("videoPlay");
+
@Resource
private IqiyiUtil iqiyiUtil;
@@ -57,16 +62,13 @@
private FunTV2Service funTV2Service;
@Resource
- private PPTVService pptvService;
-
- @Resource
private VideoInfoService videoInfoService;
@SuppressWarnings("unchecked")
// @Cacheable(value = "homeCache", key = "'getVideoInfo'+'-'+#videoid+'-'+#resourceId+'-'+#cacheMD5")
- public VideoInfo getVideoInfo(final String videoid, final String resourceId, final List<Long> reList,
+ public VideoInfo getVideoInfo(String detailSystemId,final String videoid, final String resourceId, final List<Long> reList,
String cacheMD5) {
-
+ playLogger.info(VideoLogFactory.createVideoDetailLog(detailSystemId, videoid,resourceId));
return (VideoInfo) videoInfoDao.excute(new HibernateCallback<VideoInfo>() {
public VideoInfo doInHibernate(Session session) throws HibernateException {
@@ -93,7 +95,7 @@
.createQuery("select rv.resource from ResourceVideo rv where rv.video.id=?")
.setParameter(0, videoid).list();
- rv.getVideo().setVideoDetailList(getVideoDetailList(videoid, rv.getResource()));
+ rv.getVideo().setVideoDetailList(getVideoDetailList(videoid, rv.getResource(), 1, 100));
for (VideoResource r : resourceList) {
if (r.getId().equalsIgnoreCase(rv.getResource().getId())) {
r.setChecked(true);
@@ -133,7 +135,7 @@
"select rv.resource from ResourceVideo rv where rv.video.id=? order by rv.resource.id desc")
.setParameter(0, videoid).list();
- rv.getVideo().setVideoDetailList(getVideoDetailList(videoid, rv.getResource()));
+ rv.getVideo().setVideoDetailList(getVideoDetailList(videoid, rv.getResource(), 1, 100));
for (int i = 0; i < resourceList.size(); i++) {
VideoResource r = resourceList.get(i);
@@ -181,23 +183,21 @@
});
}
- private List<VideoDetailInfo> getVideoDetailList(String videoid, VideoResource vr) {
+ public List<VideoDetailInfo> getVideoDetailList(String videoid, VideoResource vr, int page, int pageSize) {
int resourceId = Integer.parseInt(vr.getId());
switch (resourceId) {
case IqiyiUtil2.RESOURCE_ID:
- return iqiyi2Service.getVideoDetailList(videoid);
+ return iqiyi2Service.getVideoDetailList(videoid, page, pageSize);
case IqiyiUtil.RESOURCE_ID:
- return iqiyiService.getVideoDetailList(videoid);
+ return iqiyiService.getVideoDetailList(videoid, page, pageSize);
case FunTVUtil2.RESOURCE_ID:
- return funTV2Service.getVideoDetailList(videoid);
+ return funTV2Service.getVideoDetailList(videoid, page, pageSize);
case FunTVUtil.RESOURCE_ID:
- return funTVService.getVideoDetailList(videoid);
- case PPTVUtil.RESOURCE_ID:
- return pptvService.getVideoDetailList(videoid);
+ return funTVService.getVideoDetailList(videoid, page, pageSize);
case AcFunUtil.RESOURCE_ID:
- return videoInfoService.getVideoDetailList(videoid, vr);
+ return videoInfoService.getVideoDetailList(videoid, vr, page, pageSize);
case SoHuUtil.RESOURCE_ID:
- return soHuService.getVideoDetailList(videoid);
+ return soHuService.getVideoDetailList(videoid, page, pageSize);
default:
return null;
}
@@ -215,8 +215,6 @@
return funTV2Service.getLatestVideoDetail(videoid);
case FunTVUtil.RESOURCE_ID:
return funTVService.getLatestVideoDetail(videoid);
- case PPTVUtil.RESOURCE_ID:
- return pptvService.getLatestVideoDetail(videoid);
case SoHuUtil.RESOURCE_ID:
return soHuService.getLatestVideoDetail(videoid);
default:
@@ -235,8 +233,6 @@
return funTV2Service.getShowType(videoid);
case FunTVUtil.RESOURCE_ID:
return funTVService.getShowType(videoid);
- case PPTVUtil.RESOURCE_ID:
- return pptvService.getShowType(videoid);
case SoHuUtil.RESOURCE_ID:
return soHuUtil.getShowType(videoid);
default:
@@ -245,19 +241,17 @@
}
@Cacheable(value = "homeCache", key = "'getPlayUrl'+'-'+#detailSystemId+'-'+#id+'-'+#type+'-'+#resourceid")
- public PlayUrl getPlayUrl(String detailSystemId, String id, String type, int resourceid, String videoid) {
-
+ public PlayUrl getPlayUrl(AcceptData acceptData, String detailSystemId, String id, String type, int resourceid, String videoid) {
+ playLogger.info(VideoLogFactory.createPlayUrlLog(detailSystemId, id, type, resourceid, videoid));
switch (resourceid) {
case IqiyiUtil2.RESOURCE_ID:
return iqiyi2Service.getPlayUrl(detailSystemId, resourceid, id, videoid);
case IqiyiUtil.RESOURCE_ID:
return iqiyiUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);
case FunTVUtil2.RESOURCE_ID:
- return funTV2Service.getPlayUrl(detailSystemId, resourceid, id, videoid);
+ return funTV2Service.getPlayUrl(acceptData, detailSystemId, resourceid, id, videoid);
case FunTVUtil.RESOURCE_ID:
return funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
- case PPTVUtil.RESOURCE_ID:
- return pptvService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
case SoHuUtil.RESOURCE_ID:
return soHuUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);
case AcFunUtil.RESOURCE_ID:
--
Gitblit v1.8.0