From 69cb3ca5c0fd5f78b0c33bf92601066a37b0209e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 十月 2020 17:36:41 +0800
Subject: [PATCH] 爱奇艺/风行资源优化
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 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 0f8c71d..cd763d1 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.vo.AcceptData;
import org.apache.commons.httpclient.HttpClient;
@@ -16,16 +17,6 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.springframework.stereotype.Controller;
-import com.yeshi.buwan.domain.Config;
-import com.yeshi.buwan.domain.DetailSystem;
-import com.yeshi.buwan.domain.HomeAd;
-import com.yeshi.buwan.domain.HomeType;
-import com.yeshi.buwan.domain.HomeVideo;
-import com.yeshi.buwan.domain.RecommendAd;
-import com.yeshi.buwan.domain.UserInfo;
-import com.yeshi.buwan.domain.VideoDetailInfo;
-import com.yeshi.buwan.domain.VideoInfo;
-import com.yeshi.buwan.domain.VideoType;
import com.yeshi.buwan.domain.entity.PlayUrl;
import com.yeshi.buwan.service.imp.AdService;
import com.yeshi.buwan.service.imp.AttentionService;
@@ -85,6 +76,9 @@
@Resource
private ClassParser classParser;
+
+ @Resource
+ private VideoDetailUtil videoDetailUtil;
@RequireUid
public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -208,7 +202,7 @@
zhibo.setName("缇庡コ");
zhibo.setHasMore(true);
zhibo.setColumns(2);
- zhibo.setHomeVideoList(meiNvZhiBoUtil.getMeiNvZhiBo(MeiNvZhiBoUtil.MEINV_KK,detailSystem,acceptData.getVersion()));
+ zhibo.setHomeVideoList(meiNvZhiBoUtil.getMeiNvZhiBo(MeiNvZhiBoUtil.MEINV_KK, detailSystem, acceptData.getVersion()));
List<VideoInfo> zhiboVideo = new ArrayList<VideoInfo>();
for (HomeVideo v : zhibo.getHomeVideoList())
zhiboVideo.add(v.getVideo());
@@ -258,6 +252,7 @@
for (HomeType ht : list) {
for (int i = 0; i < ht.getHomeVideoList().size(); i++) {
+ //鏀瑰彉鍥剧墖
if (JuheVideoUtil.isNeedDelete(ht.getHomeVideoList().get(i).getVideo(), detailSystem.getId())) {
ht.getHomeVideoList().remove(i);
i--;
@@ -416,7 +411,10 @@
JSONObject attentionInfo = new JSONObject();
attentionInfo.put("Name", info.getName());
attentionInfo.put("Picture", info.getPicture());
- attentionInfo.put("UpdateInfo", "鏇存柊:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
+ if (StringUtil.isNullOrEmpty(info.getUpdatetime()))
+ attentionInfo.put("UpdateInfo", "鏇存柊:" + TimeUtil.getCommentTime(info.getCreatetime()));
+ else
+ attentionInfo.put("UpdateInfo", "鏇存柊:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
attentionInfo.put("IsAttention", isAttention);
obj.put("Attention", attentionInfo);
}
@@ -427,6 +425,46 @@
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
obj.toString()));
}
+
+ /**
+ * 鑾峰彇瑙嗛鐨勫墽闆嗗垪琛�
+ *
+ * @param acceptData
+ * @param request
+ * @param out
+ */
+ @RequireUid
+ public void getVideoEpisodeList(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ String videoId = request.getParameter("VideoId");
+ String resourceId = request.getParameter("ResourceId");
+ String page = request.getParameter("Page");//椤电爜
+
+ if (StringUtil.isNullOrEmpty(videoId)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燰ideoId"));
+ return;
+ }
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燫esourceId"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(page)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燩age"));
+ return;
+ }
+
+
+ List<VideoDetailInfo> list = videoDetailUtil.getVideoDetailList(videoId, new VideoResource(resourceId), Integer.parseInt(page), 100);
+ if (list == null)
+ list = new ArrayList<>();
+ JSONObject data = new JSONObject();
+ String listStr = StringUtil.outPutResultJson(list);
+ boolean hasMore = list != null && list.size() > 0;
+ data.put("list", listStr);
+ data.put("hasMore", hasMore);
+ out.print(JsonUtil.loadTrueJson(data.toString()));
+ }
+
@RequireUid
public void getNewVideoDetail(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -477,7 +515,7 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- PlayUrl pu = videoDeailUtil.getPlayUrl(detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ PlayUrl pu = videoDeailUtil.getPlayUrl(acceptData,detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
if (pu != null) {
if (!StringUtil.isNullOrEmpty(pu.getUrl()))
@@ -490,6 +528,7 @@
}
+
public List<HomeVideo> getZhiBoVideoList() throws Exception {
List<HomeVideo> list = new ArrayList<HomeVideo>();
String result = get("http://www.kktv1.com/CDN/output/M/3/I/10002002/P/start-0_offset-6_platform-2/json.js");
--
Gitblit v1.8.0