From e8e342cd6c1334f1b8f71d24baa3157637a9ac43 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 二月 2021 19:33:26 +0800
Subject: [PATCH] 完善PPTV
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
index 9fbd87b..689ca09 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -2,14 +2,16 @@
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.yeshi.buwan.domain.*;
+import com.yeshi.buwan.pptv.PPTVUtil;
+import com.yeshi.buwan.pptv.entity.PPTVSeries;
+import com.yeshi.buwan.service.imp.*;
+import com.yeshi.buwan.service.inter.juhe.PPTVService;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.vo.AcceptData;
import org.apache.commons.httpclient.HttpClient;
@@ -18,18 +20,6 @@
import org.springframework.stereotype.Controller;
import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.service.imp.AdService;
-import com.yeshi.buwan.service.imp.AttentionService;
-import com.yeshi.buwan.service.imp.ClassService;
-import com.yeshi.buwan.service.imp.CollectionService;
-import com.yeshi.buwan.service.imp.CommentService;
-import com.yeshi.buwan.service.imp.ConfigService;
-import com.yeshi.buwan.service.imp.HomeAdService;
-import com.yeshi.buwan.service.imp.HomeTypeService;
-import com.yeshi.buwan.service.imp.StatisticsService;
-import com.yeshi.buwan.service.imp.SystemService;
-import com.yeshi.buwan.service.imp.UserService;
-import com.yeshi.buwan.service.imp.VideoManager;
import com.yeshi.buwan.util.CacheUtil;
import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.util.JsonUtil;
@@ -79,6 +69,12 @@
@Resource
private VideoDetailUtil videoDetailUtil;
+
+ @Resource
+ private ResourceVideoService resourceVideoService;
+
+ @Resource
+ private PPTVService pptvService;
@RequireUid
public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -341,8 +337,31 @@
List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
- VideoInfo info = (videoDeailUtil.getVideoInfo(detailSystem.getId(), videoId, resourceId, resourceList,
- CacheUtil.getMD5Long(resourceList)));
+ //鑾峰彇浼樺厛灞曠ず鐨勬笭閬�
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ Set<Long> rids = new HashSet<>();
+ rids.addAll(resourceList);
+ VideoResource defaultVideoResource = resourceVideoService.getDefaultVideoResource(videoId, rids);
+ if (defaultVideoResource != null) {
+ resourceId = defaultVideoResource.getId();
+ }
+ }
+
+ //PPTV缃戦〉鎾斁
+ if (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
+ JSONObject data = new JSONObject();
+ PPTVSeries series = pptvService.getSeriesDetailByVideoId(videoId);
+ String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(0));
+ data.put("videoId", videoId);
+ data.put("playUrl", playUrl);
+ data.put("pptv", true);
+ out.print(JsonUtil.loadTrueJson(data.toString()));
+ return;
+ }
+
+
+ VideoInfo info = videoDeailUtil.getVideoInfo(detailSystem.getId(), videoId, resourceId, resourceList,
+ CacheUtil.getMD5Long(resourceList));
List<VideoType> typeList = classService.getVideoTypeList(info.getId());
if (typeList != null && typeList.size() > 0) {
@@ -359,23 +378,8 @@
if (StringUtil.isNullOrEmpty(vd.getExtraId()))
vd.setExtraId(vd.getId() + "");
}
- System.out.println(info.getPlayPicture());
- // info.setPicture(VideoPictureUtil.getShowPicture(info, platform,
- // version));
-
- // 杩囨护鐗堟潈瑙嗛鍏抽敭瀛�
-
- // 缁熻娣诲姞
- // statisticsService.addStatistics(detailSystem.getId(), videoId);
JSONArray array = new JSONArray();
- array.add("http://cloud.letv.com");
- if ((acceptData.getPlatform().equalsIgnoreCase("android")
- && acceptData.getVersion() > 12) || acceptData.getPlatform().equalsIgnoreCase("ios")) {
- for (String st : Constant.POJIE_LIST)
- array.add(st);
- }
-
long count = commentService.getComment2ListCount(videoId, thirdType);
if (info != null)
info.setCommentCount((int) count);
--
Gitblit v1.8.0