From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 209 insertions(+), 1 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 29f7ee0..4e9374e 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -13,6 +13,7 @@
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;
@@ -120,6 +121,9 @@
@Resource
private APPManager appManager;
+
+ @Resource
+ private VideoResourceInfoMapService videoResourceInfoMapService;
private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
@@ -668,6 +672,9 @@
//瑙嗛杩囨护
private void filterVideo(AcceptData acceptData, VideoInfo video) {
+ //杩囨护瑙嗛璧勬簮
+ List<VideoResource> resourceList = videoResourceInfoMapService.filter(acceptData.getDetailSystem().getId(), video.getResourceList());
+ video.setResourceList(resourceList);
//鎺у埗鍓嶇鍒楄〃涓殑鏉ユ簮鏄剧ず闂
if ("48".equalsIgnoreCase(acceptData.getDetailSystem().getId())) {
if (video.getArea() != null && video.getArea().contains("闊╁浗")) {
@@ -894,7 +901,6 @@
//瑙嗛杩囨护
filterVideo(acceptData, info);
- UserInfo user = userService.getUserInfo(acceptData.getUid());
if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
String sessionId = createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId);
@@ -915,6 +921,208 @@
}
+ @RequireUid
+ public void getVideoDetailNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ String videoId = request.getParameter("VideoId");
+ if (!NumberUtil.isNumeric(videoId)) {
+ String[] cidVid = PPTVUtil.parseCidAndVidFromVisualVideoId(videoId);
+ if (cidVid == null) {
+ int fromType = VideoUtil.getVideoFromType(videoId);
+ //鐭棰�
+ if (fromType == HomeVideo.FROM_TYPE_SHORT) {
+ getVideoDetailForShortVideo(acceptData, videoId, request, out);
+ return;
+ } else if (fromType == HomeVideo.FROM_TYPE_INTERNET) {
+ 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("vip", PPTVUtil.isVIPVideo(series.getFree()));
+ JSONObject pptv = new JSONObject();
+ pptv.put("pptv", data);
+ out.print(JsonUtil.loadTrueJson(pptv.toString()));
+ } else {
+ out.print(JsonUtil.loadFalseJson("宸蹭笅绾�"));
+ }
+
+ return;
+ }
+
+ String resourceId = request.getParameter("ResourceId");
+ String thirdType = request.getParameter("Type");
+ String loginUid = request.getParameter("LoginUid");
+ String position = request.getParameter("Position");
+ String from = request.getParameter("From");
+
+ if (StringUtil.isNullOrEmpty(videoId)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燰ideoId"));
+ return;
+ }
+ if (StringUtil.isNullOrEmpty(thirdType)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燭ype"));
+ return;
+ }
+
+ DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
+
+ //鑾峰彇浼樺厛灞曠ず鐨勬笭閬�
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ Set<Long> rids = new HashSet<>();
+ rids.addAll(resourceList);
+ VideoResource defaultVideoResource = resourceVideoService.getDefaultVideoResource(videoId, rids);
+ if (defaultVideoResource != null) {
+ resourceId = defaultVideoResource.getId();
+ }
+ //瑙嗛娌℃湁鏉ユ簮
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
+ out.print(JsonUtil.loadFalseJson("瑙嗛宸蹭笅绾�"));
+ return;
+ }
+ }
+
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ int p = 0;
+ if (!StringUtil.isNullOrEmpty(position)) {
+ p = Integer.parseInt(position);
+ }
+
+ VideoWatchHistory history = new VideoWatchHistory();
+ history.setDevice(acceptData.getDevice());
+ history.setVideoId(videoId);
+ history.setUid(loginUid);
+ history.setPosition(p);
+ videoWatchHistoryService.add(history);
+ }
+ });
+
+ userPlayLogger.info(VideoLogFactory.createUserVideoDetailLog(acceptData.getDevice(), acceptData.getUtdId(), loginUid, acceptData.getDetailSystem().getId(), videoId, resourceId, from));
+
+
+ //PPTV缃戦〉鎾斁
+ if (!StringUtil.isNullOrEmpty(resourceId) && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
+ JSONObject data = new JSONObject();
+ VideoPPTVMap map = pptvService.getVideoPPTVMapByVideoId(videoId);
+ int p = 0;
+ if (!StringUtil.isNullOrEmpty(position)) {
+ p = Integer.parseInt(position);
+ } else {
+ //鍙栨挱鏀捐褰�
+ VideoWatchHistory history = videoWatchHistoryService.getWatchHistory(acceptData.getDevice(), videoId);
+ if (history != null && history.getPosition() != null) {
+ p = history.getPosition();
+ }
+ }
+
+ String videoName = "";
+ String playUrl = null;
+
+ 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", 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() {
+ //鐪婸P瑙嗛
+ deviceAdStrategyService.watchPPTVVideo(acceptData.getUtdId(), acceptData.getDetailSystem().getId());
+ }
+ });
+ 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) {
+ VideoType type = typeList.get(0);
+ while (type.getParent() != null)
+ type = type.getParent();
+ info.setVideoType(type);
+ }
+
+ info.setPlayPicture(VideoPictureUtil.getShowPicture(info, acceptData.getPlatform(), acceptData.getVersion() + ""));
+
+ if (info.getVideoDetailList() != null)
+ for (VideoDetailInfo vd : info.getVideoDetailList()) {
+ if (StringUtil.isNullOrEmpty(vd.getExtraId()))
+ vd.setExtraId(vd.getId() + "");
+ }
+ info.setCommentCount(0);
+
+
+ VideoDetailVO.AttentionInfo attention = null;
+ if (info.getVideoDetailList() != null)
+ if (info.getVideoDetailList().size() > 1) {// 澶氶泦,鍙叧娉�
+ boolean isAttention = false;
+ if (!StringUtil.isNullOrEmpty(loginUid)) {
+ isAttention = attentionService.isAddAttention(loginUid, info.getId());
+ }
+ attention = new VideoDetailVO.AttentionInfo();
+ attention.setName(info.getName());
+ attention.setPicture(info.getPicture());
+ if (StringUtil.isNullOrEmpty(info.getUpdatetime())) {
+ attention.setUpdateInfo("鏇存柊:" + TimeUtil.getCommentTime(info.getCreatetime()));
+ } else {
+ attention.setUpdateInfo("鏇存柊:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
+ }
+ attention.setAttention(isAttention);
+ }
+
+ //瑙嗛杩囨护
+ filterVideo(acceptData, info);
+ 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(), acceptData.getVersion(), acceptData.getChannel(), loginUid, videoId, from), attention, sessionId))));
+
+ 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.setShortVideoAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), videoId, from, showTime, null);
+ }
+ });
+ }
+
+
/**
* 鑾峰彇瑙嗛鐨勫墽闆嗗垪琛�
*
--
Gitblit v1.8.0