From e89de9319d8f771f8e53cb5f876d06465a580c57 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 02 八月 2021 18:23:22 +0800 Subject: [PATCH] kafka日志集成 --- src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java index c15a5df..9ce1d9d 100644 --- a/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java +++ b/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java @@ -123,6 +123,7 @@ String sign = request.getParameter("Sign"); String platform = request.getParameter("Platform"); String packageName = request.getParameter("Package"); + String channel = request.getParameter("Channel"); if (StringUtil.isNullOrEmpty(method)) { out.print(JsonUtil.loadFalseJson("璇蜂笂浼燤ethod")); return; @@ -148,7 +149,7 @@ DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName); - List<HomeAd> list = homeAdService.getHomeAdList(detailSystem); + List<HomeAd> list = homeAdService.getHomeAdList(detailSystem, "recommend"); for (HomeAd ad : list) { if (ad.getVideo() != null) { @@ -164,7 +165,7 @@ array.add(StringUtil.outPutResultJson(list.get(i))); object.put("homeAdList", array); - object.put("homeTypeList", getHomeType(uid, platform, detailSystem.getId())); + object.put("homeTypeList", getHomeType(uid, platform, detailSystem.getId(), channel)); // 鎺掕 JSONObject rank = new JSONObject(); @@ -188,11 +189,11 @@ } // 棣栭〉绫诲瀷鑾峰彇 - private JSONArray getHomeType(String uid, String platform, String detailsystemid) { + private JSONArray getHomeType(String uid, String platform, String detailsystemid, String channel) { - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1); - List<HomeType> list1 = homeTypeService.getHomeType(detailsystemid, resourceList, - CacheUtil.getMD5Long(resourceList), 10, 309); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1, channel); + List<HomeType> list1 = homeTypeService.getHomeType(detailsystemid, platform, 1, resourceList, + CacheUtil.getMD5Long(resourceList), 10, "recommend"); List<HomeType> list = new ArrayList<>(); for (HomeType ht : list1) list.add(ht); @@ -389,7 +390,7 @@ return; } - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1, null); DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName); List<VideoType> typeList = getFirstType(pid); @@ -770,7 +771,7 @@ return; } - List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), Integer.parseInt(version)); + List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), Integer.parseInt(version), null); VideoInfo info = (videoDeailUtil.getVideoInfo(null, videoId, resourceId, resourceList, CacheUtil.getMD5Long(resourceList))); -- Gitblit v1.8.0