From 56481656c7de11cdca69c1a7dd69db176ffd9ecd Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 08 五月 2021 12:49:30 +0800 Subject: [PATCH] 华为屏蔽金币任务中的看海量视频,新增广告平台概率控制 --- src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java | 108 ++++++++++------------------------------------------- 1 files changed, 21 insertions(+), 87 deletions(-) diff --git a/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java b/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java index 2730bb1..8661937 100644 --- a/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java +++ b/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java @@ -1,103 +1,37 @@ package com.yeshi.buwan.util.JuHe; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - +import com.yeshi.buwan.domain.system.DetailSystem; +import com.yeshi.buwan.service.inter.video.VideoResourceVersionMapService; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; -import com.yeshi.buwan.dao.VideoResourceDao; -import com.yeshi.buwan.domain.VideoResource; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Component public class VideoResourceUtil { @Resource - private VideoResourceDao videoResourceDao; + private VideoResourceVersionMapService videoResourceVersionMapService; - public VideoResourceDao getVideoResourceDao() { - return videoResourceDao; - } - - public void setVideoResourceDao(VideoResourceDao videoResourceDao) { - this.videoResourceDao = videoResourceDao; - } - - @Cacheable(value = "homeCache", key = "'getAvailableResourceIds-'+'-'+#platform+'-'+#versionCode") - public List<Long> getAvailableResourceIds(String platform, int versionCode) { - List<VideoResource> resourceList = videoResourceDao.list("from VideoResource"); - List<Long> list = new ArrayList<>(); - if ("android".equalsIgnoreCase(platform)) {// Android - for (VideoResource vr : resourceList) { - String resourceName = vr.getName(); - if (resourceName.indexOf("鐖卞鑹�") > -1) { - list.add(Long.parseLong(vr.getId())); - } else if (resourceName.indexOf("鑵捐") > -1) - list.add(Long.parseLong(vr.getId())); - else if (resourceName.indexOf("鎼滅嫄") > -1) - list.add(Long.parseLong(vr.getId())); - else if (resourceName.indexOf("AcFun") > -1) - list.add(Long.parseLong(vr.getId())); - else if (resourceName.indexOf("椋庤") > -1) - list.add(Long.parseLong(vr.getId())); - } - } else if ("ios".equalsIgnoreCase(platform)) { - if (versionCode < 14) { - for (VideoResource vr : resourceList) { - if (vr.getName().contains("鐖卞鑹�") || vr.getName().contains("鎼滅嫄") || vr.getName().contains("椋庤")) { - list.add(Long.parseLong(vr.getId())); - } - } - } else if (versionCode < 16) { - for (VideoResource vr : resourceList) { - if (vr.getName().contains("鐖卞鑹�") || vr.getName().contains("鎼滅嫄") || vr.getName().contains("椋庤")) { - list.add(Long.parseLong(vr.getId())); - } - } - } else if (versionCode < 18) { - for (VideoResource vr : resourceList) { - if (vr.getName().contains("鐖卞鑹�") - || vr.getName().contains( - "鎼滅嫄")/* || vr.getName().contains("PPTV") */ - || vr.getName().contains("鑵捐") || vr.getName().contains("椋庤")) { - list.add(Long.parseLong(vr.getId())); - } - } - } else if (versionCode < 50) { - for (VideoResource vr : resourceList) { - if (vr.getName().contains("鐖卞鑹�") - || vr.getName().contains( - "鎼滅嫄") /* || vr.getName().contains("PPTV") */ - || vr.getName().contains("鑵捐") || vr.getName().contains("涔愯") - ) {//|| vr.getName().contains("椋庤") - list.add(Long.parseLong(vr.getId())); - } - } - } else { - for (VideoResource vr : resourceList) { - if (vr.getName().contains("鐖卞鑹�") - || vr.getName().contains( - "鎼滅嫄") /* || vr.getName().contains("PPTV") */ - || vr.getName().contains("鑵捐") || vr.getName().contains("涔愯") - || vr.getName().contains("AcFun") || vr.getName().contains("椋庤"))//|| vr.getName().contains("椋庤") - list.add(Long.parseLong(vr.getId())); - } - } - - } else { - for (VideoResource vr : resourceList) { - if (vr.getName().contains("鐖卞鑹�") || vr.getName().contains("鎼滅嫄") || vr.getName().contains("鑵捐") - || vr.getName().contains("涔愯") - || vr.getName().contains("AcFun") || vr.getName().contains("椋庤")) {// - // || vr.getName().contains("椋庤") - list.add(Long.parseLong(vr.getId())); - } + @Cacheable(value = "homeCache", key = "'getAvailableResourceIds-'+'-'+#detailSystem.id+'-'+#versionCode") + public List<Long> getAvailableResourceIds(DetailSystem detailSystem, int versionCode) { + List<String> ridList = videoResourceVersionMapService.listResourceId(detailSystem.getId(), versionCode); + if (detailSystem.getId().equalsIgnoreCase("43") && versionCode > 83) { + ridList = new ArrayList<>(); +// ridList.add("19"); +// ridList.add("24"); + ridList.add("25"); + } + List<Long> ids = new ArrayList<>(); + if (ridList != null) { + for (String id : ridList) { + ids.add(Long.parseLong(id)); } } - return list; - } + return ids; + } } -- Gitblit v1.8.0