From 7def9937241d8c5fada7a63c8a0fd144bf0c05ff Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 三月 2021 19:32:21 +0800
Subject: [PATCH] IOS上线版本资源隐藏
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 4028002..dbe8e6b 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -12,16 +12,21 @@
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.jump.JumpDetail;
import com.yeshi.buwan.domain.jump.JumpTypeEnum;
+import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.video.VideoWatchHistory;
+import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.pptv.entity.PPTVSeries;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
+import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.annotation.RequireUid;
+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.vo.AcceptData;
import org.apache.commons.httpclient.HttpClient;
@@ -83,17 +88,23 @@
@Resource
private VideoWatchHistoryService videoWatchHistoryService;
+ @Resource
+ private HomeRecommendSpecialService homeRecommendSpecialService;
+
private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
@RequireUid
public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String vtid = request.getParameter("Vtid");
- if (!"310".equals(vtid)) {
+ HomeRecommendSpecial special = homeRecommendSpecialService.getSpecial(vtid);
+ //鍏煎鏂扮増鏈�
+ if (special != null) {
+
JSONObject object = new JSONObject();
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- List<HomeAd> list = homeAdService.getHomeAdList(detailSystem);
+ List<HomeAd> list = homeAdService.getHomeAdList(detailSystem, special != null ? special.getDataKey() : null);
if (acceptData.getPlatform().equalsIgnoreCase("ios"))// IOS娴嬭瘯
{
@@ -119,7 +130,6 @@
for (int i = 0; i < list.size(); i++)
array.add(StringUtil.outPutResultJson(list.get(i)));
object.put("data", array);
-
} else {
for (HomeAd ad : list) {
if (ad.getVideo() != null) {
@@ -137,6 +147,7 @@
object.put("data", array);
}
+ object.put("bannerSizeRate", special.getBannerSizeRate());
out.print(JsonUtil.loadTrueJson(object.toString()));
} else {
classParser.getRecommendCategoryVideoBanner(acceptData, request, out);
@@ -156,12 +167,14 @@
vtid = "309"; // 涓轰簡鍏煎浠ュ墠鐨勬帹鑽�
}
+ HomeRecommendSpecial special = homeRecommendSpecialService.getSpecial(vtid);
+
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
JSONObject object = new JSONObject();
List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), resourceList,
- CacheUtil.getMD5Long(resourceList), -1, Long.parseLong(vtid));
+ CacheUtil.getMD5Long(resourceList), -1, special != null ? special.getDataKey() : null);
List<HomeType> list = new ArrayList<>();
for (HomeType ht : list1)
list.add(ht);
@@ -201,7 +214,7 @@
if (adContent != null && adPosition != null) {
HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
int adP = Integer.parseInt(adPosition.getValue());
- if (adP < list.size()) {
+ if (adP < list.size() && adP > -1) {
HomeType homeType = new HomeType();
homeType.setAd(ad);
list.add(adP, homeType);
@@ -409,12 +422,14 @@
data.put("name", series.getName());
data.put("pptv", true);
out.print(JsonUtil.loadTrueJson(data.toString()));
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, series.getName(), from));
return;
}
VideoInfo info = videoDeailUtil.getVideoInfo(detailSystem.getId(), videoId, resourceId, resourceList,
CacheUtil.getMD5Long(resourceList));
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, info != null ? info.getName() : "", from));
List<VideoType> typeList = classService.getVideoTypeList(info.getId());
if (typeList != null && typeList.size() > 0) {
--
Gitblit v1.8.0