From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容

---
 src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java |  100 +++++++-------------------------------------------
 1 files changed, 14 insertions(+), 86 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 c043fa0..fc846ca 100644
--- a/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java
@@ -1,101 +1,29 @@
 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);
+        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