Merge branch 'feature_refactor' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/FilterParam.java

@@ -12,7 +12,6 @@ import java.util.Set;
 @Data
 public class FilterParam {
     private List<Long> videoIds;
-    private Map<Long, String> flowPoolMap;
     private int appType;
     private String mid;
     private String uid;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/AbstractFilterService.java → recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/FilterService.java

@@ -6,11 +6,11 @@ import com.tzld.piaoquan.recommend.server.service.ServiceBeanFactory;
 import com.tzld.piaoquan.recommend.server.service.filter.strategy.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -20,11 +20,17 @@ import java.util.concurrent.TimeUnit;
  * @author dyp
  */
 @Slf4j
-public abstract class AbstractFilterService {
+@Component
+public class FilterService {
 
     private final ExecutorService pool = ThreadPoolFactory.filterPool();
 
-    protected List<Long> viewFilter(FilterParam param) {
+    public FilterResult filter(FilterParam param) {
+        List<Long> videoIds = viewFilter(param);
+        return new FilterResult(videoIds);
+    }
+
+    private List<Long> viewFilter(FilterParam param) {
 
         List<FilterStrategy> strategies = getStrategies(param);
         CountDownLatch cdl = new CountDownLatch(strategies.size());

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/FlowPoolWithLevelFilterService.java

@@ -1,26 +0,0 @@
-package com.tzld.piaoquan.recommend.server.service.filter;
-
-import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolService;
-import com.tzld.piaoquan.recommend.server.util.JSONUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author dyp
- */
-@Service
-@Slf4j
-public class FlowPoolWithLevelFilterService extends AbstractFilterService {
-
-    public FilterResult filter(FilterParam param) {
-        List<Long> videoIds = viewFilter(param);
-        return new FilterResult(videoIds);
-    }
-}

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/RegionFilterService.java

@@ -1,16 +0,0 @@
-package com.tzld.piaoquan.recommend.server.service.filter;
-
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author dyp
- */
-@Service
-public class RegionFilterService extends AbstractFilterService {
-    public FilterResult filter(FilterParam param) {
-        List<Long> videoIds = viewFilter(param);
-        return new FilterResult(videoIds);
-    }
-}

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/VideoFilterService.java

@@ -1,17 +0,0 @@
-package com.tzld.piaoquan.recommend.server.service.filter;
-
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author dyp
- */
-@Service
-public class VideoFilterService extends AbstractFilterService {
-    public FilterResult filter(FilterParam param) {
-        List<Long> videoIds = viewFilter(param);
-
-        return new FilterResult(videoIds);
-    }
-}

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/strategy/VovLowerStrategy.java

@@ -1,194 +0,0 @@
-package com.tzld.piaoquan.recommend.server.service.filter.strategy;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
-import com.tzld.piaoquan.recommend.server.service.filter.FilterStrategy;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Nonnull;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Component
-public class VovLowerStrategy implements FilterStrategy {
-
-    @ApolloJsonValue("${vov.filter.condition:{}}")
-    private Map<String, Double> vovFilterCondition;
-
-    @Autowired
-    @Qualifier("redisTemplate")
-    private RedisTemplate<String, String> redisTemplate;
-
-    private static final String KEY_FORMAT = "redis:vid_vov_daily4filter:%d";
-
-    private static final String LOWER_VOV_VID_KEY_FORMAT = "redis:lower_vov_vid:%s";
-    private static final DateTimeFormatter YYYY_MM_DD = DateTimeFormatter.ofPattern("yyyyMMdd");
-
-    /**
-     * 低VOV视频ID集合缓存, 五分钟有效期
-     */
-    private final LoadingCache<String, Set<Long>> lowerVovVidCache = CacheBuilder.newBuilder()
-            .expireAfterWrite(5, TimeUnit.MINUTES)
-            .build(new CacheLoader<String, Set<Long>>() {
-                @Override
-                public Set<Long> load(@Nonnull String key) {
-                    Set<String> members = redisTemplate.opsForSet().members(key);
-                    if (CollectionUtils.isEmpty(members)) {
-                        return Collections.emptySet();
-                    }
-                    return members.stream()
-                            .map(Long::parseLong)
-                            .collect(Collectors.toSet());
-                }
-            });
-
-    @Override
-    public List<Long> filter(FilterParam param) {
-
-        List<Long> videoIds = param.getVideoIds();
-        if (CollectionUtils.isEmpty(videoIds)) {
-            log.info("VOV过滤 -- videoIds为空，跳过");
-            return new ArrayList<>();
-        }
-
-        List<Long> result = new ArrayList<>(videoIds.size());
-        List<Long> removeIds = new ArrayList<>();
-
-        String dt = LocalDate.now().format(YYYY_MM_DD);
-        String redisKey = String.format(LOWER_VOV_VID_KEY_FORMAT, dt);
-        try {
-            Set<Long> lowerVovVidSet = lowerVovVidCache.get(redisKey);
-
-            for (Long videoId : videoIds) {
-                if (lowerVovVidSet.contains(videoId)) {
-                    removeIds.add(videoId);
-                } else {
-                    result.add(videoId);
-                }
-            }
-
-        } catch (Exception e) {
-            log.error("VOV过滤V2 -- 从缓存中获取低VOV视频ID集合异常: ", e);
-        }
-
-        log.info("VOV过滤V2 -- 本次召回的ID列表为: {}, 被过滤掉的ID列表为: {}, 剩下的ID列表为: {}", videoIds, removeIds, result);
-
-        return result;
-    }
-
-    public List<Long> filterV1(List<Long> videoIds) {
-
-        List<Long> result = new ArrayList<>(videoIds.size());
-
-        List<String> redisKeys = videoIds.stream()
-                .map(r -> String.format(KEY_FORMAT, r))
-                .collect(Collectors.toList());
-        List<String> vovInfos = redisTemplate.opsForValue().multiGet(redisKeys);
-        if (CollectionUtils.isEmpty(vovInfos) || vovInfos.size() != videoIds.size()) {
-            log.info("VOV过滤 -- 获取到的视频VOV信息为空或长度与videoIds长度不一致，跳过: {}, {}", videoIds.size(), vovInfos.size());
-            return result;
-        }
-
-        List<Long> removeIds = new ArrayList<>();
-
-        for (int i = 0; i < videoIds.size(); i++) {
-            Long videoId = videoIds.get(i);
-            String vovInfo = vovInfos.get(i);
-            if (isShouldFilter(vovInfo)) {
-                removeIds.add(videoId);
-                continue;
-            }
-
-            result.add(videoId);
-        }
-
-        log.info("VOV过滤V1 -- 本次召回的ID列表为: {}, 被过滤掉的ID列表为: {}, 剩下的ID列表为: {}", videoIds, removeIds, result);
-
-        return result;
-    }
-
-    private boolean isShouldFilter(String vovInfo) {
-        try {
-
-            if (StringUtils.isEmpty(vovInfo)) {
-                return false;
-            }
-
-            Map<String, Double> vovInfoMap = JSON.parseObject(vovInfo, new TypeReference<Map<String, Double>>() {
-            });
-            if (MapUtils.isEmpty(vovInfoMap)) {
-                return false;
-            }
-
-            if (isNewVideo(vovInfoMap) || isUptrendVideo(vovInfoMap)) {
-                return false;
-            }
-
-            // 预估VOV
-            double t1Vov0 = vovInfoMap.getOrDefault("1_vov0", 0d);
-            double t2Vov0 = vovInfoMap.getOrDefault("2_vov0", 0d);
-
-            double estimated2Vov0Alpha = vovFilterCondition.getOrDefault("estimated_2_vov_0_alpha", 0.2d);
-            double estimated1Vov0Alpha = vovFilterCondition.getOrDefault("estimated_1_vov_0_alpha", 0.8d);
-            double estimatedVovThreshold = vovFilterCondition.getOrDefault("estimated_vov_threshold", 0.19d);
-
-            double estimatedVov = t1Vov0;
-            if (t2Vov0 != 0) {
-                estimatedVov = estimated2Vov0Alpha * t2Vov0 + estimated1Vov0Alpha * t1Vov0;
-            }
-
-            return estimatedVov < estimatedVovThreshold;
-        } catch (Exception e) {
-            log.info("VOV过滤 -- 异常: ", e);
-        }
-        return false;
-    }
-
-    // 三天曝光都小于阈值的 认定为新视频
-    private boolean isNewVideo(Map<String, Double> vovInfoMap) {
-        double t2ViewPvCondition = vovFilterCondition.getOrDefault("t_2_view_pv", 50d);
-        double t3ViewPvCondition = vovFilterCondition.getOrDefault("t_3_view_pv", 50d);
-        double t4ViewPvCondition = vovFilterCondition.getOrDefault("t_4_view_pv", 50d);
-        double t2ViewPv = vovInfoMap.getOrDefault("2_vov0_分母", 0d);
-        double t3ViewPv = vovInfoMap.getOrDefault("3_vov0_分母", 0d);
-        double t4ViewPv = vovInfoMap.getOrDefault("4_vov0_分母", 0d);
-
-        return t2ViewPv < t2ViewPvCondition && t3ViewPv < t3ViewPvCondition && t4ViewPv < t4ViewPvCondition;
-    }
-
-    // 最近两天的vov满足并值，且昨天的vov-前天的vov 达到一定的涨幅认定为上升趋势视频
-    private boolean isUptrendVideo(Map<String, Double> vovInfoMap) {
-
-        double t1VovCondition = vovFilterCondition.getOrDefault("t_1_vov", 0.2d);
-        double t2VovCondition = vovFilterCondition.getOrDefault("t_2_vov", 0d);
-        double vovDiff = vovFilterCondition.getOrDefault("12_vov_diff", 0.1);
-
-        double t1Vov0 = vovInfoMap.getOrDefault("1_vov0", 0d);
-        double t2Vov0 = vovInfoMap.getOrDefault("2_vov0", 0d);
-        double t12VovDiff = t1Vov0 - t2Vov0;
-
-        return t2Vov0 > t2VovCondition && t1Vov0 > t1VovCondition && t12VovDiff > vovDiff;
-
-    }
-
-    @Scheduled(cron = "0 0/5 * * * ? ")
-    public void cronSync() {
-    }
-}

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/FilterParamFactory.java

@@ -10,24 +10,6 @@ import java.util.Map;
  * @author dyp
  */
 public class FilterParamFactory {
-    public static FilterParam create(RecallParam param, Map<Long, String> videoFlowPoolMap) {
-        FilterParam filterParam = new FilterParam();
-        filterParam.setVideoIds(Lists.newArrayList(videoFlowPoolMap.keySet()));
-        filterParam.setAppType(param.getAppType());
-        filterParam.setMid(param.getMid());
-        filterParam.setUid(param.getUid());
-        filterParam.setFlowPoolMap(videoFlowPoolMap);
-
-        // 风险过滤
-        filterParam.setRiskUser(param.isRiskUser());
-        filterParam.setRegionCode(param.getRegionCode());
-        filterParam.setAbExpCodes(param.getAbExpCodes());
-        filterParam.setCityCode(param.getCityCode());
-        filterParam.setHotSceneType(param.getHotSceneType());
-        filterParam.setClientIp(param.getClientIp());
-        return filterParam;
-    }
-
     public static FilterParam create(RecallParam param, List<Long> videoIds) {
         FilterParam filterParam = new FilterParam();
         filterParam.setVideoIds(videoIds);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractFlowPoolWithLevelRecallStrategy.java

@@ -2,7 +2,7 @@ package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.FlowPoolWithLevelFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -27,7 +27,7 @@ public abstract class AbstractFlowPoolWithLevelRecallStrategy implements RecallS
     protected RedisTemplate<String, String> redisTemplate;
 
     @Autowired
-    protected FlowPoolWithLevelFilterService filterService;
+    protected FilterService filterService;
 
     @Override
     public List<Video> recall(RecallParam param) {
@@ -45,7 +45,8 @@ public abstract class AbstractFlowPoolWithLevelRecallStrategy implements RecallS
             String[] values = value.split("-");
             videoFlowPoolMap.put(NumberUtils.toLong(values[0], 0), values[1]);
         }
-        FilterResult filterResult = filterService.filter(FilterParamFactory.create(param, videoFlowPoolMap));
+        FilterResult filterResult = filterService.filter(FilterParamFactory.create(param,
+                new ArrayList<>(videoFlowPoolMap.keySet())));
         if (filterResult != null && CollectionUtils.isNotEmpty(filterResult.getVideoIds())) {
             filterResult.getVideoIds().stream().forEach(vid -> {
                 Video recallData = new Video();

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractRegionRecallStrategy.java

@@ -5,7 +5,7 @@ import com.google.common.reflect.TypeToken;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.RegionFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -34,7 +34,7 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
     protected RedisTemplate<String, String> redisTemplate;
 
     @Autowired
-    protected RegionFilterService filterService;
+    protected FilterService filterService;
 
     private final String recordKeyFormat = "{\"date\":\"%s\", \"h\":\"%d\"}";
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AbstractVideoRecallStrategy.java

@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
 import com.google.common.reflect.TypeToken;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.VideoFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -33,7 +33,7 @@ public abstract class AbstractVideoRecallStrategy implements RecallStrategy {
     protected RedisTemplate<String, String> redisTemplate;
 
     @Autowired
-    protected VideoFilterService filterService;
+    protected FilterService filterService;
 
     @Override
     public List<Video> recall(RecallParam param) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/AppFallbackRecallStrategy.java

@@ -3,7 +3,7 @@ package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.RegionFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -29,7 +29,7 @@ public class AppFallbackRecallStrategy implements RecallStrategy {
     public static final String PUSH_FORM = "app_fallback_recall_strategy";
 
     @Autowired
-    private RegionFilterService filterService;
+    private FilterService filterService;
     @Autowired
     @Qualifier("redisTemplate")
     private RedisTemplate<String, String> redisTemplate;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/BlessRecallStrategy.java

@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.RegionFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -30,7 +30,7 @@ public class BlessRecallStrategy implements RecallStrategy {
     @Value("${daily_bless_time_range:}")
     private String dailyBlessTimeRange;
     @Autowired
-    private RegionFilterService filterService;
+    private FilterService filterService;
 
     @Override
     public List<Video> recall(RecallParam param) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRealtimeRecallStrategyV1.java

@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.RegionFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -24,7 +24,7 @@ import java.util.*;
 public class RegionRealtimeRecallStrategyV1 implements RecallStrategy {
     private final String CLASS_NAME = this.getClass().getSimpleName();
     @Autowired
-    private RegionFilterService filterService;
+    private FilterService filterService;
 
     @Override
     public List<Video> recall(RecallParam param) {

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRealtimeRecallStrategyV5Hand.java

@@ -1,20 +1,12 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.google.common.collect.Lists;
 import com.tzld.piaoquan.recommend.server.model.Video;
-import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
-import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.RegionFilterService;
-import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
-import com.tzld.piaoquan.recommend.server.service.score.ScorerUtils;
-import com.tzld.piaoquan.recommend.server.service.score4recall.ScorerPipeline4Recall;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -31,7 +23,7 @@ public class RegionRealtimeRecallStrategyV5Hand implements RecallStrategy {
     @ApolloJsonValue("${alg.recall.special.app&vid:{}}")
     protected Map<String, List<Long>> specialAppVid;
     @Autowired
-    protected RegionFilterService filterService;
+    protected FilterService filterService;
     @Override
     public List<Video> recall(RecallParam param) {
         List<Long> vids = specialAppVid != null ? specialAppVid.getOrDefault("vid", new ArrayList<>()) : new ArrayList<>();

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/SceneCFRosnRecallStrategy.java

@@ -3,7 +3,7 @@ package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.RegionFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 public class SceneCFRosnRecallStrategy implements RecallStrategy {
     private final String CLASS_NAME = this.getClass().getSimpleName();
     @Autowired
-    private RegionFilterService filterService;
+    private FilterService filterService;
     @Autowired
     @Qualifier("redisTemplate")
     public RedisTemplate<String, String> redisTemplate;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/SceneCFRovnRecallStrategy.java

@@ -3,7 +3,7 @@ package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterResult;
-import com.tzld.piaoquan.recommend.server.service.filter.RegionFilterService;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterService;
 import com.tzld.piaoquan.recommend.server.service.recall.FilterParamFactory;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
 import com.tzld.piaoquan.recommend.server.service.recall.RecallStrategy;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 public class SceneCFRovnRecallStrategy implements RecallStrategy {
     private final String CLASS_NAME = this.getClass().getSimpleName();
     @Autowired
-    private RegionFilterService filterService;
+    private FilterService filterService;
     @Autowired
     @Qualifier("redisTemplate")
     public RedisTemplate<String, String> redisTemplate;