From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 105 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 85 insertions(+), 20 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 846e715..eaf5a25 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -13,14 +13,6 @@
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.statistic.video.VideoDetailStatisticData;
import com.yeshi.buwan.exception.video.VideoPlayException;
-import com.yeshi.buwan.service.inter.video.VideoResourceInfoMapService;
-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;
@@ -28,10 +20,11 @@
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.VideoResourceInfoMapService;
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
+import com.yeshi.buwan.service.manager.APPManager;
import com.yeshi.buwan.service.manager.VideoPlayStatisticManager;
import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
-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;
@@ -39,14 +32,22 @@
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.mq.CMQManager;
+import com.yeshi.buwan.util.mq.rabbit.RabbitmqManager;
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.videos.hanmi.HanmiUtil;
+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.videos.tencent.TencentVideoUtil;
+import com.yeshi.buwan.videos.youku.YouKuUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoDetailVO;
-import com.yeshi.buwan.videos.youku.YouKuUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.httpclient.HttpClient;
@@ -124,6 +125,12 @@
@Resource
private VideoResourceInfoMapService videoResourceInfoMapService;
+
+ @Resource
+ private HanmiUtil hanmiUtil;
+
+ @Resource
+ private RabbitmqManager rabbitmqManager;
private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
@@ -375,7 +382,7 @@
public HomeType convertHomeVideoList(HomeType type) {
- List<VideoInfo> vlist = new ArrayList<VideoInfo>();
+ List<VideoInfo> vlist = new ArrayList<>();
List<HomeVideo> list = type.getHomeVideoList();
if (list != null)
for (HomeVideo hv : list) {
@@ -634,6 +641,7 @@
try {
info = tencentVideoUtil.getVideoInfo(internetSearchVideo, pageSize);
} catch (Exception e) {
+ e.printStackTrace();
logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
return;
@@ -641,6 +649,14 @@
} 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()));
+ return;
+ }
+ }else if (Integer.parseInt(resourceId) == HanmiUtil.RESOURCE_ID) {
+ try {
+ info = hanmiUtil.getVideoInfo(internetSearchVideo, pageSize);
} catch (Exception e) {
logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
@@ -715,9 +731,9 @@
getVideoDetailForInternetSearch(acceptData, videoId, request, out);
//VIVO 娓犻亾姣忔棩骞垮憡鏈�澶氬睍绀轰竴娆�
- if ("vivo".equalsIgnoreCase(acceptData.getChannel())) {
- deviceAdStrategyService.setFSAShowTomorrow(acceptData.getUtdId(), acceptData.getDetailSystem().getId());
- }
+// if ("vivo".equalsIgnoreCase(acceptData.getChannel())) {
+// deviceAdStrategyService.setFSAShowTomorrow(acceptData.getUtdId(), acceptData.getDetailSystem().getId());
+// }
return;
}
}
@@ -774,7 +790,7 @@
}
//瑙嗛娌℃湁鏉ユ簮
if (StringUtil.isNullOrEmpty(resourceId)) {
- CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
+ rabbitmqManager.addVideoResourceDeleteMsg(videoId);
out.print(JsonUtil.loadFalseJson("瑙嗛宸蹭笅绾�"));
return;
}
@@ -912,9 +928,9 @@
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()));
//VIVO 娓犻亾姣忔棩骞垮憡鏈�澶氬睍绀轰竴娆�
- if ("vivo".equalsIgnoreCase(acceptData.getChannel())) {
- deviceAdStrategyService.setFSAShowTomorrow(acceptData.getUtdId(), acceptData.getDetailSystem().getId());
- }
+// if ("vivo".equalsIgnoreCase(acceptData.getChannel())) {
+// deviceAdStrategyService.setFSAShowTomorrow(acceptData.getUtdId(), acceptData.getDetailSystem().getId());
+// }
} else {
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
obj.toString()));
@@ -1000,7 +1016,7 @@
}
//瑙嗛娌℃湁鏉ユ簮
if (StringUtil.isNullOrEmpty(resourceId)) {
- CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
+ rabbitmqManager.addVideoResourceDeleteMsg(videoId);
out.print(JsonUtil.loadFalseJson("瑙嗛宸蹭笅绾�"));
return;
}
@@ -1251,6 +1267,55 @@
}
+ // 鑾峰彇闊╁墽鐨勬挱鏀鹃摼鎺�
+ public void getHjPlayUrl(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ String resourceId = request.getParameter("ResourceId");
+ String id = request.getParameter("Id");
+ String eid = request.getParameter("EId");
+ String type = request.getParameter("Type");
+ String videoId = request.getParameter("VideoId");
+
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燫esourceId"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(id) && StringUtil.isNullOrEmpty(eid)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼爄d"));
+ return;
+ }
+
+// if (StringUtil.isNullOrEmpty(type)) {
+// out.print(JsonUtil.loadFalseJson("璇蜂笂浼爐ype"));
+// return;
+// }
+
+ if (StringUtil.isNullOrEmpty(id))
+ id = eid;
+
+ DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+
+ 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()))
+ pu.setUrl(pu.getUrl());
+ JSONObject object = JSONObject.fromObject(StringUtil.outPutResultJson(pu));
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ } else {
+ out.print(JsonUtil.loadFalseJson("鎵句笉鍒拌瑙嗛"));
+ }
+
+ }
+
+
+
+
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