From 89e370bfdda29ac8a8f7080a18dc09a6ddc75c09 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 十月 2020 18:42:16 +0800
Subject: [PATCH] 风行爱奇艺视频更新
---
src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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..23ec03a 100644
--- a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
@@ -21,6 +21,7 @@
import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service;
import com.yeshi.buwan.sohu.SoHuUtil;
import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.vo.AcceptData;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.cache.annotation.Cacheable;
@@ -93,7 +94,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 +134,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 +182,23 @@
});
}
- 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);
+ return funTVService.getVideoDetailList(videoid, page, pageSize);
case PPTVUtil.RESOURCE_ID:
- return pptvService.getVideoDetailList(videoid);
+ return pptvService.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;
}
@@ -245,7 +246,7 @@
}
@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) {
switch (resourceid) {
case IqiyiUtil2.RESOURCE_ID:
@@ -253,7 +254,7 @@
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:
--
Gitblit v1.8.0