From ef37d60710c252e1d8473e8ce779696d497e857f Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期一, 29 三月 2021 23:59:56 +0800 Subject: [PATCH] 全网搜视频详情日志添加 --- src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 281 +++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 219 insertions(+), 62 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 9fbd87b..13d263b 100644 --- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java +++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java @@ -2,42 +2,50 @@ import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.math.BigDecimal; +import java.util.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.google.gson.Gson; 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.InternetSearchVideo; +import com.yeshi.buwan.domain.video.VideoWatchHistory; +import com.yeshi.buwan.dto.log.BaseLog; +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.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.tencent.TencentVideoUtil; +import com.yeshi.buwan.util.*; import com.yeshi.buwan.util.annotation.RequireUid; +import com.yeshi.buwan.util.factory.VideoInfoFactory; +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 com.yeshi.buwan.youku.YouKuUtil; +import com.yeshi.buwan.youku.entity.YouKuSearchVideoMap; +import com.yeshi.buwan.youku.entity.YouKuShowDetail; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.methods.GetMethod; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import com.yeshi.buwan.domain.entity.PlayUrl; -import com.yeshi.buwan.service.imp.AdService; -import com.yeshi.buwan.service.imp.AttentionService; -import com.yeshi.buwan.service.imp.ClassService; -import com.yeshi.buwan.service.imp.CollectionService; -import com.yeshi.buwan.service.imp.CommentService; -import com.yeshi.buwan.service.imp.ConfigService; -import com.yeshi.buwan.service.imp.HomeAdService; -import com.yeshi.buwan.service.imp.HomeTypeService; -import com.yeshi.buwan.service.imp.StatisticsService; -import com.yeshi.buwan.service.imp.SystemService; -import com.yeshi.buwan.service.imp.UserService; -import com.yeshi.buwan.service.imp.VideoManager; -import com.yeshi.buwan.util.CacheUtil; -import com.yeshi.buwan.util.Constant; -import com.yeshi.buwan.util.JsonUtil; -import com.yeshi.buwan.util.JuheVideoUtil; -import com.yeshi.buwan.util.StringUtil; -import com.yeshi.buwan.util.TimeUtil; -import com.yeshi.buwan.util.Utils; -import com.yeshi.buwan.util.VideoPictureUtil; import com.yeshi.buwan.util.JuHe.VideoResourceUtil; import com.yeshi.buwan.util.video.VideoDetailUtil; import com.yeshi.buwan.util.zhibo.MeiNvZhiBoUtil; @@ -47,6 +55,9 @@ @Controller public class HomeParser { + + private Logger logger = LoggerFactory.getLogger(HomeParser.class); + @Resource private SystemService systemService; @Resource @@ -54,7 +65,7 @@ @Resource private HomeTypeService homeTypeService; @Resource - private ConfigService configService; + private DetailSystemConfigService configService; @Resource private AdService adService; @Resource @@ -80,15 +91,32 @@ @Resource private VideoDetailUtil videoDetailUtil; + @Resource + private ResourceVideoService resourceVideoService; + + @Resource + private PPTVService pptvService; + + @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娴嬭瘯 { @@ -114,7 +142,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) { @@ -124,14 +151,6 @@ if (!StringUtil.isNullOrEmpty(ad.getParams())) { ad.setParams(ad.getParams().replace("\"", "\\" + "\"")); } - - // 3.4.7浠ヤ笂鐨勭増鏈墠鍙互鐢� - // com.weikou.beibeivideo.ui.mine.FXBrowserActivity - if ("com.weikou.beibeivideo.ui.mine.FXBrowserActivity".equalsIgnoreCase(ad.getClazz()) - && acceptData.getVersion() < 71) - ad.setClazz("com.weikou.beibeivideo.ui.mine.BrowserActivity"); - else - ad.setClazz("com.weikou.beibeivideo.ui.mine.FXBrowserActivity"); } object.put("count", (new StringBuilder(String.valueOf(list.size()))).toString()); JSONArray array = new JSONArray(); @@ -140,6 +159,7 @@ object.put("data", array); } + object.put("bannerSizeRate", special.getBannerSizeRate()); out.print(JsonUtil.loadTrueJson(object.toString())); } else { classParser.getRecommendCategoryVideoBanner(acceptData, request, out); @@ -158,12 +178,15 @@ if (StringUtil.isNullOrEmpty(vtid)) { vtid = "309"; // 涓轰簡鍏煎浠ュ墠鐨勬帹鑽� } + + HomeRecommendSpecial special = homeRecommendSpecialService.getSpecial(vtid); + DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName()); JSONObject object = new JSONObject(); - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion()); + 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); @@ -194,6 +217,20 @@ } } catch (Exception e) { e.printStackTrace(); + } + } + + if (VersionUtil.isGraterThan387(acceptData.getPlatform(), acceptData.getVersion())) { + DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getDetailSystem(), acceptData.getVersion()); + DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getDetailSystem(), acceptData.getVersion()); + 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() && adP > -1) { + HomeType homeType = new HomeType(); + homeType.setAd(ad); + list.add(adP, homeType); + } } } } @@ -228,13 +265,14 @@ JSONArray array = new JSONArray(); for (HomeType ht : list) { - for (int i = 0; i < ht.getHomeVideoList().size(); i++) { - //鏀瑰彉鍥剧墖 - if (JuheVideoUtil.isNeedDelete(ht.getHomeVideoList().get(i).getVideo(), detailSystem.getId())) { - ht.getHomeVideoList().remove(i); - i--; + if (ht.getHomeVideoList() != null) + for (int i = 0; i < ht.getHomeVideoList().size(); i++) { + //鏀瑰彉鍥剧墖 + if (JuheVideoUtil.isNeedDelete(ht.getHomeVideoList().get(i).getVideo(), detailSystem.getId())) { + ht.getHomeVideoList().remove(i); + i--; + } } - } } for (int i = 0; i < list.size(); i++) @@ -321,12 +359,80 @@ out.print(JsonUtil.loadTrueJson(object.toString())); } + + @Resource + private InternetSearchVideoService internetSearchVideoService; + @Resource + private YouKuUtil youKuUtil; + + @Resource + private MogoTVUtil mogoTVUtil; + + @Resource + private TencentVideoUtil tencentVideoUtil; + + + 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"); + if (StringUtil.isNullOrEmpty(resourceId)) { + resourceId = internetSearchVideo.getResourceIds().split(",")[0]; + } + VideoInfo info = null; + if (Integer.parseInt(resourceId) == YouKuUtil.RESOURCE_ID) { + try { + info = youKuUtil.getVideoInfo(internetSearchVideo); + + } catch (Exception e) { + logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId); + e.printStackTrace(); + out.print(JsonUtil.loadFalseAdmin(e.getMessage())); + return; + } + + } else if (Integer.parseInt(resourceId) == MogoTVUtil.RESOURCE_ID) { + try { + info = mogoTVUtil.getVideoInfo(internetSearchVideo); + } catch (Exception e) { + logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId); + out.print(JsonUtil.loadFalseAdmin(e.getMessage())); + return; + } + } else if (Integer.parseInt(resourceId) == TencentVideoUtil.RESOURCE_ID) { + try { + info = tencentVideoUtil.getVideoInfo(internetSearchVideo); + } catch (Exception e) { + logger.error("鍏ㄧ綉鎼滆棰戣鎯呭嚭閿欙細" + videoId); + out.print(JsonUtil.loadFalseAdmin(e.getMessage())); + return; + } + } + + LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, info.getName(), from)); + + info.setWatchCount("" + (int) (Math.random() * 1000)); + + JSONArray array = new JSONArray(); + JSONObject obj = new JSONObject(); + out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(), + obj.toString())); + } + @RequireUid public void getVideoDetail(AcceptData acceptData, HttpServletRequest request, PrintWriter out) { String videoId = request.getParameter("VideoId"); + if (!NumberUtil.isNumeric(videoId)) { + getVideoDetailForInternetSearch(acceptData, videoId, request, out); + 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")); @@ -339,10 +445,69 @@ DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName()); - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion()); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion()); - VideoInfo info = (videoDeailUtil.getVideoInfo(detailSystem.getId(), videoId, resourceId, resourceList, - CacheUtil.getMD5Long(resourceList))); + //鑾峰彇浼樺厛灞曠ず鐨勬笭閬� + if (StringUtil.isNullOrEmpty(resourceId)) { + Set<Long> rids = new HashSet<>(); + rids.addAll(resourceList); + VideoResource defaultVideoResource = resourceVideoService.getDefaultVideoResource(videoId, rids); + if (defaultVideoResource != null) { + resourceId = defaultVideoResource.getId(); + } + } + + 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 (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) { + JSONObject data = new JSONObject(); + PPTVSeries series = pptvService.getSeriesDetailByVideoId(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(); + } + } + + p = p >= series.getSeries().size() ? 0 : p; + + 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); + 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) { @@ -359,23 +524,8 @@ if (StringUtil.isNullOrEmpty(vd.getExtraId())) vd.setExtraId(vd.getId() + ""); } - System.out.println(info.getPlayPicture()); - // info.setPicture(VideoPictureUtil.getShowPicture(info, platform, - // version)); - - // 杩囨护鐗堟潈瑙嗛鍏抽敭瀛� - - // 缁熻娣诲姞 - // statisticsService.addStatistics(detailSystem.getId(), videoId); JSONArray array = new JSONArray(); - array.add("http://cloud.letv.com"); - if ((acceptData.getPlatform().equalsIgnoreCase("android") - && acceptData.getVersion() > 12) || acceptData.getPlatform().equalsIgnoreCase("ios")) { - for (String st : Constant.POJIE_LIST) - array.add(st); - } - long count = commentService.getComment2ListCount(videoId, thirdType); if (info != null) info.setCommentCount((int) count); @@ -404,6 +554,7 @@ out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(), obj.toString())); } + /** * 鑾峰彇瑙嗛鐨勫墽闆嗗垪琛� @@ -459,6 +610,12 @@ out.print(JsonUtil.loadFalseJson("璇蜂笂浼營d")); return; } + + if (!NumberUtil.isNumeric(detailId)) { + out.print(JsonUtil.loadFalseJson("")); + return; + } + boolean collect = collectionService.isCollect(acceptData.getUid(), detailId, thirdType); if (collect) @@ -548,7 +705,7 @@ public void isPraise(AcceptData acceptData, HttpServletRequest request, PrintWriter out) { DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName()); - Config config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion()); + DetailSystemConfig config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion()); if ("鏄�".equals(config.getValue())) { out.print(JsonUtil.loadTrueJson("1")); } else { -- Gitblit v1.8.0