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 |  129 ++++++-------------------------------------
 1 files changed, 18 insertions(+), 111 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 1b941cd..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,123 +1,30 @@
 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;
+    @Resource
+    private VideoResourceVersionMapService videoResourceVersionMapService;
 
-	public VideoResourceDao getVideoResourceDao() {
-		return videoResourceDao;
-	}
+    @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 ids;
+    }
 
-	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<Long>();
-		if ("android".equalsIgnoreCase(platform)) {// Android
-			if (versionCode < 30) {
-				for (VideoResource vr : resourceList) {
-					if (vr.getName().contains("鐖卞鑹�") || vr.getName().contains("鎼滅嫄")) {
-						list.add(Long.parseLong(vr.getId()));
-					}
-				}
-			} else if (versionCode < 38) {
-				for (VideoResource vr : resourceList) {
-					if (vr.getName().contains("鐖卞鑹�") || vr.getName().contains("鎼滅嫄")) {
-						list.add(Long.parseLong(vr.getId()));
-					}
-				}
-			} else if (versionCode < 43) {
-				for (VideoResource vr : resourceList) {
-					if (vr.getName().contains("鐖卞鑹�")
-							|| vr.getName().contains(
-									"鎼滅嫄") /* || vr.getName().contains("PPTV") */
-							|| 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("椋庤")){
-						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()));
-				}
-			}
-		}
-		return list;
-	}
-	
 
 }

--
Gitblit v1.8.0