From 2a593ddac16e06f1ff55edca22ea568f07b068ba Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 四月 2021 19:15:18 +0800
Subject: [PATCH] 3.9.0bug修改
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 3 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 7d5a3f8..1a2345f 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -18,15 +18,18 @@
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.PPTVUtil;
import com.yeshi.buwan.pptv.entity.PPTVSeries;
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.video.VideoWatchHistoryService;
+import com.yeshi.buwan.service.manager.VideoPlayStatisticManager;
import com.yeshi.buwan.tencent.TencentVideoUtil;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.annotation.RequireUid;
@@ -103,6 +106,9 @@
@Resource
private HomeRecommendSpecialService homeRecommendSpecialService;
+
+ @Resource
+ private DeviceAdStrategyService deviceAdStrategyService;
private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
@@ -186,7 +192,7 @@
JSONObject object = new JSONObject();
List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
- List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), resourceList,
+ List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), acceptData.getPlatform(), acceptData.getVersion(), resourceList,
CacheUtil.getMD5Long(resourceList), -1, special != null ? special.getDataKey() : null);
List<HomeType> list = new ArrayList<>();
for (HomeType ht : list1)
@@ -294,6 +300,57 @@
return type;
}
+
+ // 棣栭〉绫诲瀷鑾峰彇
+ public void getHomeVideoList(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+
+ // 20170914 涓�绾ц棰戝垎绫籌D
+ String homeTypeId = request.getParameter("Id");
+ int page = Integer.parseInt(request.getParameter("Page"));
+
+ if (StringUtil.isNullOrEmpty(homeTypeId)) {
+ out.print(JsonUtil.loadFalseJson(""));
+ return;
+ }
+
+ HomeType homeType = homeTypeService.getHomeTypeById(homeTypeId);
+ if (homeType == null) {
+ out.print(JsonUtil.loadFalseJson(""));
+ return;
+ }
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ //鏌ヨ澶у浘
+ List<HomeVideo> bigPictureVideos = homeTypeService.getHomeVideoList(homeTypeId, resourceList, true, 1, homeType.getNumber());
+
+
+ //澶у浘闇�瑕佹瘡娆￠兘杩斿洖
+
+ JSONObject object = new JSONObject();
+
+ Long count = homeTypeService.getHomeVideoListCount(homeTypeId, resourceList, null);
+ List<HomeVideo> list1 = homeTypeService.getHomeVideoList(homeTypeId, resourceList, false, page, homeType.getNumber());
+ List<HomeVideo> list = new ArrayList<>();
+ list.addAll(bigPictureVideos);
+ list.addAll(list1);
+ JSONObject data = new JSONObject();
+ object.put("count", count);
+ JSONArray array = new JSONArray();
+ for (int i = 0; i < list.size(); i++)
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ object.put("list", array);
+
+ //鍒ゆ柇鏄惁杩樻湁涓嬩竴椤�
+ int totalPage = (int) ((count - bigPictureVideos.size()) % homeType.getNumber() == 0 ? (count - bigPictureVideos.size()) / homeType.getNumber() : (count - bigPictureVideos.size()) / homeType.getNumber() + 1);
+
+ if (page >= totalPage) {
+ page = 0;
+ }
+ object.put("page", page);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+
@RequireUid
public void getMoreVideo(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String type = request.getParameter("Type");
@@ -372,6 +429,29 @@
@Resource
private TencentVideoUtil tencentVideoUtil;
+ @Resource
+ private VideoPlayStatisticManager videoPlayStatisticManager;
+
+
+ private String createVideoDetailSessionId(AcceptData acceptData, String uid, String videoName, String videoId, String resourceId) {
+
+ try {
+ VideoDetailStatisticData data = new VideoDetailStatisticData();
+ data.setDetailSystemId(acceptData.getDetailSystem().getId());
+ data.setLoginUid(uid);
+ data.setResourceId(Integer.parseInt(resourceId));
+ data.setUtdId(acceptData.getUtdId());
+ data.setVersion(acceptData.getVersion());
+ data.setVideoId(videoId);
+ data.setVideoName(videoName);
+
+ return videoPlayStatisticManager.createVideoDetailSessionId(data);
+ } catch (Exception e) {
+
+ }
+ return null;
+ }
+
public void getVideoDetailForInternetSearch(AcceptData acceptData, String videoId, HttpServletRequest request, PrintWriter out) {
String loginUid = request.getParameter("LoginUid");
@@ -419,7 +499,7 @@
JSONObject obj = new JSONObject();
if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
- out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), new VideoDetailVO.VideoAdInfo(true,false), null)), array.toString(),
+ 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(),
obj.toString()));
} else {
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
@@ -501,13 +581,25 @@
p = p >= series.getSeries().size() ? 0 : p;
+ String sessionId = createVideoDetailSessionId(acceptData, loginUid, series.getName(), videoId, resourceId);
String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(p));
data.put("videoId", videoId);
data.put("playUrl", playUrl);
data.put("name", series.getName());
data.put("pptv", true);
+ data.put("sessionId", sessionId);
out.print(JsonUtil.loadTrueJson(data.toString()));
LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, series.getName(), from));
+
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ //姣忓ぉ灞曠ず涓�娆″箍鍛�
+ long showTime = TimeUtil.convertGernalTime(TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"), "yyyy-MM-dd");
+
+ deviceAdStrategyService.setVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), showTime, showTime);
+ }
+ });
return;
}
@@ -565,7 +657,9 @@
}
UserInfo user = userService.getUserInfo(acceptData.getUid());
if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
- out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), new VideoDetailVO.VideoAdInfo(true,true), attention)), array.toString(),
+ 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(),
obj.toString()));
} else {
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
--
Gitblit v1.8.0