From e404b19151ef1786aded572ed9bbaec4b5266e45 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 四月 2021 18:55:01 +0800
Subject: [PATCH] 直播初步集成

---
 src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 381676e..d8a75a8 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -41,6 +41,7 @@
 import com.yeshi.buwan.util.log.LoggerUtil;
 import com.yeshi.buwan.util.log.UserActiveLogFactory;
 import com.yeshi.buwan.util.log.VideoLogFactory;
+import com.yeshi.buwan.videos.bilibili.BilibiliUtil;
 import com.yeshi.buwan.vo.AcceptData;
 import com.yeshi.buwan.vo.video.VideoDetailVO;
 import com.yeshi.buwan.youku.YouKuUtil;
@@ -522,6 +523,9 @@
     private TencentVideoUtil tencentVideoUtil;
 
     @Resource
+    private BilibiliUtil bilibiliUtil;
+
+    @Resource
     private VideoPlayStatisticManager videoPlayStatisticManager;
 
 
@@ -584,6 +588,14 @@
         } else if (Integer.parseInt(resourceId) == TencentVideoUtil.RESOURCE_ID) {
             try {
                 info = tencentVideoUtil.getVideoInfo(internetSearchVideo, pageSize);
+            } catch (Exception e) {
+                logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
+                out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
+                return;
+            }
+        }else if (Integer.parseInt(resourceId) == BilibiliUtil.RESOURCE_ID) {
+            try {
+                info = bilibiliUtil.getVideoInfo(internetSearchVideo, pageSize);
             } catch (Exception e) {
                 logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
                 out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
@@ -800,7 +812,7 @@
         if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
             String sessionId = createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId);
 
-            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), loginUid), attention, sessionId)), array.toString(),
+            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), loginUid,videoId,from), attention, sessionId)), array.toString(),
                     obj.toString()));
         } else {
             out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),

--
Gitblit v1.8.0