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 | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 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 adb2601..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,15 +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.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.service.imp.*;
import com.yeshi.buwan.service.inter.ad.DeviceAdStrategyService;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
@@ -29,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;
@@ -40,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;
@@ -128,6 +128,9 @@
@Resource
private HanmiUtil hanmiUtil;
+
+ @Resource
+ private RabbitmqManager rabbitmqManager;
private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
@@ -728,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;
}
}
@@ -787,7 +790,7 @@
}
//瑙嗛娌℃湁鏉ユ簮
if (StringUtil.isNullOrEmpty(resourceId)) {
- CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
+ rabbitmqManager.addVideoResourceDeleteMsg(videoId);
out.print(JsonUtil.loadFalseJson("瑙嗛宸蹭笅绾�"));
return;
}
@@ -925,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()));
@@ -1013,7 +1016,7 @@
}
//瑙嗛娌℃湁鏉ユ簮
if (StringUtil.isNullOrEmpty(resourceId)) {
- CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
+ rabbitmqManager.addVideoResourceDeleteMsg(videoId);
out.print(JsonUtil.loadFalseJson("瑙嗛宸蹭笅绾�"));
return;
}
--
Gitblit v1.8.0