From 745320cbb4edfa4fbc8f0f95483a4ee7893d5769 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 四月 2021 20:18:08 +0800
Subject: [PATCH] 3.9.2完善
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 194 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 178 insertions(+), 16 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 878c360..4d60e6c 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,21 @@
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.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 +109,9 @@
@Resource
private HomeRecommendSpecialService homeRecommendSpecialService;
+
+ @Resource
+ private DeviceAdStrategyService deviceAdStrategyService;
private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
@@ -283,6 +292,54 @@
}
+ // 棣栭〉绫诲瀷鑾峰彇
+ public void getHomeTypeNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ // 20170914 涓�绾ц棰戝垎绫籌D
+ String page = request.getParameter("Page");
+ String pageSize = request.getParameter("PageSize");
+ String dataKey = request.getParameter("DataKey");
+
+ long count = homeTypeService.countHomeType(acceptData.getDetailSystem().getId(), acceptData.getVersion(), dataKey);
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<HomeType> homeTypeList = homeTypeService.getHomeTypeList(acceptData.getDetailSystem().getId(), acceptData.getVersion(), dataKey, Integer.parseInt(page), Integer.parseInt(pageSize));
+
+ if (homeTypeList != null)
+ for (HomeType homeType : homeTypeList) {
+ String resourceKey = StringUtil.Md5(org.yeshi.utils.StringUtil.concat(resourceList, ","));
+
+ long bigPictureCount = homeType.isBigPicture() ? 1 : 0;// homeTypeService.getHomeVideoListCount(homeType.getId(), resourceKey, resourceList, true);
+
+ List<HomeVideo> homeVideoList = homeTypeService.getHomeVideoList(homeType.getId(), resourceKey, resourceList, null, 1, homeType.getNumber() + (int) bigPictureCount);
+ if (bigPictureCount > 0 && homeVideoList.size() > 0) {
+ homeVideoList.get(0).setBigPicture(true);
+ }
+ long videoCount = homeTypeService.getHomeVideoListCount(homeType.getId(), resourceKey, resourceList, null);
+
+ if (videoCount - bigPictureCount > homeType.getNumber()) {
+ while ((videoCount - bigPictureCount) % homeType.getNumber() != 0) {
+ videoCount--;
+ }
+ }
+ homeType.setCount((int) videoCount);
+ List<HomeVideo> tempHomeVideoList = new ArrayList<>();
+ tempHomeVideoList.addAll(homeVideoList);
+ while (tempHomeVideoList != null && (tempHomeVideoList.size() - bigPictureCount) % homeType.getColumns() != 0)
+ tempHomeVideoList.remove(tempHomeVideoList.size() - 1);
+
+ homeType.setHomeVideoList(tempHomeVideoList);
+ }
+
+ JSONObject object = new JSONObject();
+ JSONArray array = new JSONArray();
+ for (int i = 0; i < homeTypeList.size(); i++)
+ array.add(StringUtil.outPutResultJson(homeTypeList.get(i)));
+ object.put("data", array);
+ object.put("count", count + "");
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+
public HomeType convertHomeVideoList(HomeType type) {
List<VideoInfo> vlist = new ArrayList<VideoInfo>();
List<HomeVideo> list = type.getHomeVideoList();
@@ -315,20 +372,34 @@
List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
//鏌ヨ澶у浘
- List<HomeVideo> bigPictureVideos = homeTypeService.getHomeVideoList(homeTypeId, resourceList, true, page, homeType.getNumber());
+ List<HomeVideo> bigPictureVideos = new ArrayList<>();
+ if (homeType.isBigPicture()) {
+ bigPictureVideos = homeTypeService.getHomeVideoList(homeTypeId, org.yeshi.utils.StringUtil.concat(resourceList, ","), resourceList, null, 1, 1);
+ if (bigPictureVideos != null && bigPictureVideos.size() > 0)
+ bigPictureVideos.get(0).setBigPicture(true);
+ }
//澶у浘闇�瑕佹瘡娆￠兘杩斿洖
JSONObject object = new JSONObject();
+ String resourceKey = StringUtil.Md5(org.yeshi.utils.StringUtil.concat(resourceList, ","));
- Long count = homeTypeService.getHomeVideoListCount(homeTypeId, resourceList, null);
- List<HomeVideo> list1 = homeTypeService.getHomeVideoList(homeTypeId, resourceList, false, page, homeType.getNumber());
+ Long count = homeTypeService.getHomeVideoListCount(homeTypeId, resourceKey, resourceList, null);
+ if (count - bigPictureVideos.size() > homeType.getNumber()) {
+
+ while ((count - bigPictureVideos.size()) % homeType.getNumber() != 0) {
+ count--;
+ }
+ }
+
+
+ List<HomeVideo> list1 = homeTypeService.getHomeVideoList(homeTypeId, resourceKey, resourceList, homeType.isBigPicture(), page, homeType.getNumber());
List<HomeVideo> list = new ArrayList<>();
list.addAll(bigPictureVideos);
list.addAll(list1);
JSONObject data = new JSONObject();
- data.put("count", count);
+ object.put("count", count);
JSONArray array = new JSONArray();
for (int i = 0; i < list.size(); i++)
array.add(StringUtil.outPutResultJson(list.get(i)));
@@ -340,7 +411,7 @@
if (page >= totalPage) {
page = 0;
}
- data.put("page", page);
+ object.put("page", page);
out.print(JsonUtil.loadTrueJson(object.toString()));
}
@@ -423,19 +494,50 @@
@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");
String from = request.getParameter("From");
InternetSearchVideo internetSearchVideo = internetSearchVideoService.selectByPrimaryKey(videoId);
String resourceId = request.getParameter("ResourceId");
+ String position = request.getParameter("Position");
+ int pageSize = 100;
+ if (!StringUtil.isNullOrEmpty(position)) {
+ if (VersionUtil.isGraterThan391(acceptData.getPlatform(), acceptData.getVersion()))
+ pageSize = (Integer.parseInt(position) / 100 + 1) * 100;
+ }
+
+
if (StringUtil.isNullOrEmpty(resourceId)) {
resourceId = internetSearchVideo.getResourceIds().split(",")[0];
}
VideoInfo info = null;
if (Integer.parseInt(resourceId) == YouKuUtil.RESOURCE_ID) {
try {
- info = youKuUtil.getVideoInfo(internetSearchVideo);
+ info = youKuUtil.getVideoInfo(internetSearchVideo, pageSize);
} catch (Exception e) {
logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
@@ -446,7 +548,7 @@
} else if (Integer.parseInt(resourceId) == MogoTVUtil.RESOURCE_ID) {
try {
- info = mogoTVUtil.getVideoInfo(internetSearchVideo);
+ info = mogoTVUtil.getVideoInfo(internetSearchVideo, pageSize);
} catch (Exception e) {
logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
@@ -454,13 +556,16 @@
}
} else if (Integer.parseInt(resourceId) == TencentVideoUtil.RESOURCE_ID) {
try {
- info = tencentVideoUtil.getVideoInfo(internetSearchVideo);
+ info = tencentVideoUtil.getVideoInfo(internetSearchVideo, pageSize);
} catch (Exception e) {
logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId);
out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
return;
}
}
+
+ if (info != null)
+ info.setPageSize(pageSize);
LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, info.getName(), from));
@@ -470,7 +575,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(),
@@ -482,7 +587,32 @@
public void getVideoDetail(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String videoId = request.getParameter("VideoId");
if (!NumberUtil.isNumeric(videoId)) {
- getVideoDetailForInternetSearch(acceptData, videoId, request, out);
+ String[] cidVid = PPTVUtil.parseCidAndVidFromVisualVideoId(videoId);
+ if (cidVid == null) {
+ getVideoDetailForInternetSearch(acceptData, videoId, request, out);
+ return;
+ }
+ String cid = cidVid[0];
+ String vid = cidVid[1];
+
+ PPTVSeries series = pptvService.getSeriesDetail(cid);
+ if (series == null) {
+ series = PPTVApiUtil.getDetail(cid);
+ }
+
+ if (series != null) {
+ JSONObject data = new JSONObject();
+ String playUrl = PPTVUtil.getPlayUrl(series, pptvService.selectProgramById(vid));
+ data.put("videoId", videoId);
+ data.put("playUrl", playUrl);
+ data.put("name", series.getName());
+ data.put("pptv", true);
+ data.put("vip", PPTVUtil.isVIPVideo(series.getFree()));
+ out.print(JsonUtil.loadTrueJson(data.toString()));
+ } else {
+ out.print(JsonUtil.loadFalseJson("宸蹭笅绾�"));
+ }
+
return;
}
@@ -538,7 +668,7 @@
//PPTV缃戦〉鎾斁
if (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
JSONObject data = new JSONObject();
- PPTVSeries series = pptvService.getSeriesDetailByVideoId(videoId);
+ VideoPPTVMap map = pptvService.getVideoPPTVMapByVideoId(videoId);
int p = 0;
if (!StringUtil.isNullOrEmpty(position)) {
p = Integer.parseInt(position);
@@ -550,15 +680,40 @@
}
}
- p = p >= series.getSeries().size() ? 0 : p;
+ String videoName = "";
+ String playUrl = null;
- String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(p));
+ PPTVSeries series = pptvService.getSeriesDetail(map.getInfoId());
+
+ if (map.getProgramCode() != null) {
+ PPTVProgram program = pptvService.selectProgramById(map.getProgramCode());
+ videoName = program.getProgramSetTiltle();
+ playUrl = PPTVUtil.getPlayUrl(series, program);
+ } else {
+ videoName = series.getName();
+ p = p >= series.getSeries().size() ? 0 : p;
+ playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(p));
+ }
+
+ String sessionId = createVideoDetailSessionId(acceptData, loginUid, videoName, videoId, resourceId);
data.put("videoId", videoId);
data.put("playUrl", playUrl);
- data.put("name", series.getName());
+ data.put("name", videoName);
data.put("pptv", true);
+ data.put("vip", "1".equalsIgnoreCase(series.getFree()));
+ 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, null);
+ }
+ });
return;
}
@@ -616,7 +771,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(),
@@ -637,6 +794,7 @@
String videoId = request.getParameter("VideoId");
String resourceId = request.getParameter("ResourceId");
String page = request.getParameter("Page");//椤电爜
+ String pageSize = request.getParameter("PageSize");//椤�
if (StringUtil.isNullOrEmpty(videoId)) {
out.print(JsonUtil.loadFalseJson("璇蜂笂浼燰ideoId"));
@@ -651,9 +809,13 @@
out.print(JsonUtil.loadFalseJson("璇蜂笂浼燩age"));
return;
}
+ int pagesize = 100;
+ if (!StringUtil.isNullOrEmpty(pageSize)) {
+ pagesize = Integer.parseInt(pageSize);
+ }
- List<VideoDetailInfo> list = videoDetailUtil.getVideoDetailList(videoId, new VideoResource(resourceId), Integer.parseInt(page), 100);
+ List<VideoDetailInfo> list = videoDetailUtil.getVideoDetailList(videoId, new VideoResource(resourceId), Integer.parseInt(page), pagesize);
if (list == null)
list = new ArrayList<>();
JSONObject data = new JSONObject();
--
Gitblit v1.8.0