From f06a592dd1a7e995bf313ccb5efe7dff73ccfc4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 四月 2023 18:25:52 +0800
Subject: [PATCH] 增加本地获取IP归属地/广告优化
---
src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 fc846ca..675175f 100644
--- a/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/JuHe/VideoResourceUtil.java
@@ -1,6 +1,7 @@
package com.yeshi.buwan.util.JuHe;
import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.service.inter.video.VideoResourcePlayVersionMapService;
import com.yeshi.buwan.service.inter.video.VideoResourceVersionMapService;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component;
@@ -14,15 +15,41 @@
@Resource
private VideoResourceVersionMapService videoResourceVersionMapService;
- @Cacheable(value = "homeCache", key = "'getAvailableResourceIds-'+'-'+#detailSystem.id+'-'+#versionCode")
- public List<Long> getAvailableResourceIds(DetailSystem detailSystem, int versionCode) {
- List<String> ridList = videoResourceVersionMapService.listResourceId(detailSystem.getId(), versionCode);
+ @Resource
+ private VideoResourcePlayVersionMapService videoResourcePlayVersionMapService;
+
+ @Cacheable(value = "homeCache", key = "'getAvailableResourceIds-'+'-'+#detailSystem.id+'-'+#versionCode+'-'+#channel")
+ public List<Long> getAvailableResourceIds(DetailSystem detailSystem, int versionCode,String channel) {
+ List<String> ridList = videoResourceVersionMapService.listResourceId(detailSystem.getId(), versionCode,channel.toLowerCase());
+// if (detailSystem.getId().equalsIgnoreCase("43") && versionCode > 83) {
+// ridList = new ArrayList<>();
+//// ridList.add("19");
+//// ridList.add("24");
+// ridList.add("25");
+// }
+ ridList.remove(25+"");
+ ridList.remove(28+"");
List<Long> ids = new ArrayList<>();
if (ridList != null) {
for (String id : ridList) {
ids.add(Long.parseLong(id));
}
}
+
+ return ids;
+ }
+
+
+ @Cacheable(value = "homeCache", key = "'getAvailablePlayResourceIds-'+'-'+#detailSystem.id+'-'+#versionCode+'-'+#channel")
+ public List<Long> getAvailablePlayResourceIds(DetailSystem detailSystem, int versionCode,String channel) {
+ List<String> ridList = videoResourcePlayVersionMapService.listResourceId(detailSystem.getId(), versionCode,channel.toLowerCase());
+ List<Long> ids = new ArrayList<>();
+ if (ridList != null) {
+ for (String id : ridList) {
+ ids.add(Long.parseLong(id));
+ }
+ }
+
return ids;
}
--
Gitblit v1.8.0