From b5e19564dcbf1b7ec12946209d74313479f9dfe1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 十二月 2021 19:51:31 +0800
Subject: [PATCH] 布丸vivo上架兼容
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 145 +++++++++++++++++++++++++++++++++---------------
1 files changed, 100 insertions(+), 45 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 5682ae2..29f7ee0 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -1,57 +1,53 @@
package com.yeshi.buwan.controller.parser;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.util.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
import com.google.gson.Gson;
import com.yeshi.buwan.domain.*;
-import com.yeshi.buwan.domain.jump.JumpDetail;
-import com.yeshi.buwan.domain.jump.JumpTypeEnum;
+import com.yeshi.buwan.domain.entity.PlayUrl;
import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
import com.yeshi.buwan.domain.solr.SolrShortVideo;
import com.yeshi.buwan.domain.special.SearchSpecialPositionMap;
-import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.domain.video.VideoWatchHistory;
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.statistic.video.VideoDetailStatisticData;
-import com.yeshi.buwan.mogotv.MogoTVUtil;
-import com.yeshi.buwan.pptv.PPTVApiUtil;
-import com.yeshi.buwan.pptv.PPTVUtil;
-import com.yeshi.buwan.pptv.entity.PPTVProgram;
-import com.yeshi.buwan.pptv.entity.PPTVSeries;
-import com.yeshi.buwan.pptv.entity.VideoPPTVMap;
+import com.yeshi.buwan.exception.video.VideoPlayException;
+import com.yeshi.buwan.service.manager.APPManager;
+import com.yeshi.buwan.videos.mogotv.MogoTVUtil;
+import com.yeshi.buwan.videos.pptv.PPTVApiUtil;
+import com.yeshi.buwan.videos.pptv.PPTVUtil;
+import com.yeshi.buwan.videos.pptv.entity.PPTVProgram;
+import com.yeshi.buwan.videos.pptv.entity.PPTVSeries;
+import com.yeshi.buwan.videos.pptv.entity.VideoPPTVMap;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.ad.DeviceAdStrategyService;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
-import com.yeshi.buwan.service.inter.juhe.YouKuService;
import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
import com.yeshi.buwan.service.inter.recommend.HomeVideoService;
import com.yeshi.buwan.service.inter.search.SearchSpecialPositionMapService;
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
import com.yeshi.buwan.service.manager.VideoPlayStatisticManager;
import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
-import com.yeshi.buwan.tencent.TencentVideoUtil;
+import com.yeshi.buwan.videos.tencent.TencentVideoUtil;
import com.yeshi.buwan.util.*;
+import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.util.factory.VideoInfoFactory;
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.util.video.shortvideo.ShortVideoUtil;
+import com.yeshi.buwan.util.mq.CMQManager;
+import com.yeshi.buwan.util.video.VideoDetailUtil;
+import com.yeshi.buwan.util.video.VideoUtil;
+import com.yeshi.buwan.util.zhibo.MeiNvZhiBoUtil;
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;
-import com.yeshi.buwan.youku.entity.YouKuSearchVideoMap;
-import com.yeshi.buwan.youku.entity.YouKuShowDetail;
+import com.yeshi.buwan.videos.youku.YouKuUtil;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
@@ -59,13 +55,11 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
-import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
-import com.yeshi.buwan.util.video.VideoDetailUtil;
-import com.yeshi.buwan.util.zhibo.MeiNvZhiBoUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.*;
@Controller
public class HomeParser {
@@ -123,6 +117,9 @@
@Resource
private DeviceAdStrategyService deviceAdStrategyService;
+
+ @Resource
+ private APPManager appManager;
private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
@@ -213,7 +210,7 @@
list.add(ht);
if ("309".equals(vtid)) {
if (!"ios".equalsIgnoreCase(acceptData.getPlatform())) {
- Map<String, String> confMap = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
+ Map<String, String> confMap = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
String mm = confMap.get("meinv_mm_count");
int count = Integer.parseInt(mm);
if (count > 0) {
@@ -242,8 +239,8 @@
}
if (VersionUtil.isGraterThan387(acceptData.getPlatform(), acceptData.getVersion())) {
- DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getDetailSystem(), acceptData.getVersion());
- DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (adContent != null && adPosition != null) {
HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
int adP = Integer.parseInt(adPosition.getValue());
@@ -335,7 +332,7 @@
homeType.setCount((int) videoCount);
List<HomeVideo> tempHomeVideoList = new ArrayList<>();
tempHomeVideoList.addAll(homeVideoList);
- while (tempHomeVideoList != null && tempHomeVideoList.size() > 0 && (tempHomeVideoList.size() - bigPictureCount) % homeType.getColumns() != 0)
+ while (tempHomeVideoList != null && tempHomeVideoList.size() > 0 && (tempHomeVideoList.size() - bigPictureCount) % homeType.getColumns() != 0 && homeType.getColumns() < 4)
tempHomeVideoList.remove(tempHomeVideoList.size() - 1);
homeType.setHomeVideoList(tempHomeVideoList);
@@ -343,8 +340,8 @@
try {
if (VersionUtil.isGraterThan387(acceptData.getPlatform(), acceptData.getVersion()) && dataKey.equalsIgnoreCase("recommend")) {
- DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getDetailSystem(), acceptData.getVersion());
- DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (adContent != null && adPosition != null) {
HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
int adP = Integer.parseInt(adPosition.getValue());
@@ -598,6 +595,17 @@
if (StringUtil.isNullOrEmpty(resourceId)) {
resourceId = internetSearchVideo.getResourceIds().split(",")[0];
}
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
+
+ if (resourceList != null) {
+ if (!resourceList.contains(Long.parseLong(resourceId))) {
+ out.print(JsonUtil.loadFalseAdmin(""));
+ return;
+ }
+ }
+
+
VideoInfo info = null;
if (Integer.parseInt(resourceId) == YouKuUtil.RESOURCE_ID) {
try {
@@ -643,16 +651,46 @@
info.setWatchCount("" + (int) (Math.random() * 1000));
+ //瑙嗛杩囨护
+ filterVideo(acceptData, info);
+
JSONArray array = new JSONArray();
JSONObject obj = new JSONObject();
if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
- out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), loginUid), null, createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId))), array.toString(),
+ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel(), loginUid), null, createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId))), array.toString(),
obj.toString()));
} else {
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
obj.toString()));
}
+ }
+
+ //瑙嗛杩囨护
+ private void filterVideo(AcceptData acceptData, VideoInfo video) {
+ //鎺у埗鍓嶇鍒楄〃涓殑鏉ユ簮鏄剧ず闂
+ if ("48".equalsIgnoreCase(acceptData.getDetailSystem().getId())) {
+ if (video.getArea() != null && video.getArea().contains("闊╁浗")) {
+ //鍒ゆ柇褰撳墠鐗堟湰鏄惁姝ｅ湪涓婄嚎
+ if (appManager.isOnline(acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel())) {
+ //濡傛灉鍦ㄤ笂绾垮氨鍒犻櫎鏈�変腑鐨勮祫婧愶紝骞朵笖灏嗗綋鍓嶈祫婧愬彉涓洪煩杩稵V
+ for (int i = 0; i < video.getResourceList().size(); i++) {
+ if (!video.getResourceList().get(i).isChecked()) {
+ video.getResourceList().remove(i--);
+ }
+ }
+ if (video.getResourceList().size() > 0) {
+ video.getResourceList().get(0).setName("PP瑙嗛");
+ //鍦↖D鍓嶉潰娣诲姞native鏍囪瘑
+ for (VideoDetailInfo videoDetailInfo : video.getVideoDetailList()) {
+ videoDetailInfo.setExtraId("native_" + videoDetailInfo.getExtraId());
+ }
+ }
+ }
+ }
+
+ }
+
}
@RequireUid
@@ -661,13 +699,15 @@
if (!NumberUtil.isNumeric(videoId)) {
String[] cidVid = PPTVUtil.parseCidAndVidFromVisualVideoId(videoId);
if (cidVid == null) {
+ int fromType = VideoUtil.getVideoFromType(videoId);
//鐭棰�
- if (ShortVideoUtil.isShortVideoId(videoId)) {
+ if (fromType == HomeVideo.FROM_TYPE_SHORT) {
getVideoDetailForShortVideo(acceptData, videoId, request, out);
return;
+ } else if (fromType == HomeVideo.FROM_TYPE_INTERNET) {
+ getVideoDetailForInternetSearch(acceptData, videoId, request, out);
+ return;
}
- getVideoDetailForInternetSearch(acceptData, videoId, request, out);
- return;
}
String cid = cidVid[0];
String vid = cidVid[1];
@@ -720,6 +760,12 @@
if (defaultVideoResource != null) {
resourceId = defaultVideoResource.getId();
}
+ //瑙嗛娌℃湁鏉ユ簮
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
+ out.print(JsonUtil.loadFalseJson("瑙嗛宸蹭笅绾�"));
+ return;
+ }
}
ThreadUtil.run(new Runnable() {
@@ -743,7 +789,7 @@
//PPTV缃戦〉鎾斁
- if (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
+ if (!StringUtil.isNullOrEmpty(resourceId) && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
JSONObject data = new JSONObject();
VideoPPTVMap map = pptvService.getVideoPPTVMapByVideoId(videoId);
int p = 0;
@@ -844,11 +890,15 @@
attentionInfo.put("IsAttention", attention.isAttention());
obj.put("Attention", attentionInfo);
}
+
+ //瑙嗛杩囨护
+ filterVideo(acceptData, info);
+
UserInfo user = userService.getUserInfo(acceptData.getUid());
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, videoId, from), attention, sessionId)), array.toString(),
+ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel(), loginUid, videoId, from), attention, sessionId)), array.toString(),
obj.toString()));
} else {
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
@@ -965,7 +1015,12 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- PlayUrl pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ PlayUrl pu = null;
+ try {
+ pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ } catch (VideoPlayException e) {
+ e.printStackTrace();
+ }
if (pu != null) {
if (!StringUtil.isNullOrEmpty(pu.getUrl()))
@@ -1019,7 +1074,7 @@
public void isPraise(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- DetailSystemConfig config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
+ DetailSystemConfig config = configService.getConfigByKey("banner_praise", acceptData.getChildDetailSystem(), acceptData.getVersion());
if ("鏄�".equals(config.getValue())) {
out.print(JsonUtil.loadTrueJson("1"));
} else {
@@ -1041,7 +1096,7 @@
public void getRecommendSearchSpecial(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
//鎺ㄨ崘鎼滅储涓撻
- DetailSystemConfig config = configService.getConfigByKey("recommend_search_special_position", detailSystem, acceptData.getVersion());
+ DetailSystemConfig config = configService.getConfigByKey("recommend_search_special_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (config == null) {
out.print(JsonUtil.loadFalseAdmin("浣嶇疆涓虹┖"));
return;
--
Gitblit v1.8.0