rick user filter

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/common/RedisKeyConstants.java

@@ -0,0 +1,12 @@
+package com.tzld.piaoquan.recommend.server.common;
+
+/**
+ * @author dyp
+ */
+public class RedisKeyConstants {
+
+    public static class Recommend{
+        public static String riskUserMid = "risk:user:mid";
+        public static String riskUserUid = "risk:user:uid";
+    }
+}

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

@@ -47,7 +47,6 @@ public class HistoryLongPeriodFilter extends AbstractFilter<Video> {
         RecallParam recallParam = recommendService.convertToRecallParam(recommendParam);
         FilterParam filterParam = FilterParamFactory.create(recallParam,
                 list.stream().map(Video::getVideoId).collect(Collectors.toList()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/model/RecommendParam.java

@@ -39,19 +39,12 @@ public class RecommendParam {
     private int size;
     private String uid;
 
-    // 风险过滤
-    private int expansionFactor;
-    private Boolean riskFilterFlag;
-    private Map<Integer, List<String>> appRegionFiltered;
-
-    @JSONField(serialize = false)
-    private List<Long> videosWithRisk;
-
     private String regionCode;
     private MachineInfo machineInfo;
     private String province;
     private String city;
     private Set<String> abExpCodes;
+    private boolean riskUser;
 
     // 层 - 实验
     private Map<String, String> expIdMap;

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

@@ -3,7 +3,11 @@ package com.tzld.piaoquan.recommend.server.service;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Strings;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.reflect.TypeToken;
+import com.tzld.piaoquan.recommend.server.common.RedisKeyConstants;
 import com.tzld.piaoquan.recommend.server.common.base.Constant;
 import com.tzld.piaoquan.recommend.server.gen.common.Result;
 import com.tzld.piaoquan.recommend.server.gen.recommend.*;
@@ -96,8 +100,32 @@ public class RecommendService {
 
     private ThreadLocal<Map<String, Object>> timerLogMapTL = ThreadLocal.withInitial(HashMap::new);
 
+    @Value("${risk.video.filter.switch:true}")
+    private boolean riskVideoFilterSwitch;
+    @ApolloJsonValue("${risk.scene:[]}")
+    private Set<String> riskScenes;
+
+    private LoadingCache<String, Set<String>> riskUserCache = CacheBuilder.newBuilder()
+            .maximumSize(5)
+            .refreshAfterWrite(300, TimeUnit.SECONDS)
+            .expireAfterWrite(300, TimeUnit.SECONDS)
+            .expireAfterAccess(300, TimeUnit.SECONDS)
+            .build(new CacheLoader<String, Set<String>>() {
+                @Override
+                public Set<String> load(String key) {
+                    Set<String> result = redisTemplate.opsForSet().members(key);
+                    if (CollectionUtils.isEmpty(result)) {
+                        return Collections.emptySet();
+                    }
+                    return result;
+                }
+            });
+
     @PostConstruct
     public void init() {
+        Set<String> data1 = riskUserCache.getUnchecked(RedisKeyConstants.Recommend.riskUserUid);
+        Set<String> data2 = riskUserCache.getUnchecked(RedisKeyConstants.Recommend.riskUserMid);
+        log.info("riskUserCache uid size {}  mid size {}", data1.size(), data2.size());
     }
 
     public RecommendResponse homepageRecommend(RecommendRequest request) {
@@ -390,52 +418,13 @@ public class RecommendService {
         param.setLastDigit(lastDigit);
 
         // 风险过滤
-        List<String> keysRisk = new ArrayList<>();
-        keysRisk.add("RISK_SHIELD_FILTER_RULE_V1_JSON");
-        keysRisk.add("RISK_SHIELD_FILTER_VIDEO_V1_STR");
-        keysRisk.add("RISK_SHIELD_FILTER_EXPANSION_FACTOR_INT");
-        keysRisk.add("RISK_SHIELD_FILTER_FLAG_BOOL");
-        List<String> valuesRisk = redisTemplate.opsForValue().multiGet(keysRisk);
-        String RISK_SHIELD_FILTER_RULE_V1_JSON = "";
-        String RISK_SHIELD_FILTER_VIDEO_V1_STR = "";
-        String RISK_SHIELD_FILTER_EXPANSION_FACTOR_INT = "";
-        String RISK_SHIELD_FILTER_FLAG_BOOL = "";
-        if (valuesRisk != null && valuesRisk.size() == 4) {
-            RISK_SHIELD_FILTER_RULE_V1_JSON = valuesRisk.get(0);
-            RISK_SHIELD_FILTER_VIDEO_V1_STR = valuesRisk.get(1);
-            RISK_SHIELD_FILTER_EXPANSION_FACTOR_INT = valuesRisk.get(2);
-            RISK_SHIELD_FILTER_FLAG_BOOL = valuesRisk.get(3);
-        } else {
-            log.error("risk rule read redis is wrong");
-        }
-        Map<Integer, List<String>> appRegionFiltered = ParserUtils.parseJsonForRiskRule(RISK_SHIELD_FILTER_RULE_V1_JSON);
-        List<Long> videosWithRisk = ParserUtils.parseJsonForRiskVideos(RISK_SHIELD_FILTER_VIDEO_V1_STR);
-        int expansionFactor = 5;
-        if (RISK_SHIELD_FILTER_EXPANSION_FACTOR_INT != null) {
-            try {
-                expansionFactor = Integer.parseInt(RISK_SHIELD_FILTER_EXPANSION_FACTOR_INT);
-            } catch (NumberFormatException e) {
-                expansionFactor = 5;
-            }
+        if (riskVideoFilterSwitch) {
+            boolean riskUser = riskScenes.contains(param.getHotSceneType())
+                    || riskUserCache.getUnchecked(RedisKeyConstants.Recommend.riskUserUid).contains(param.getUid())
+                    || riskUserCache.getUnchecked(RedisKeyConstants.Recommend.riskUserMid).contains(param.getMid());
+            param.setRiskUser(riskUser);
         }
-        // 容灾
-        if (expansionFactor < 5) {
-            expansionFactor = 5;
-        } else if (expansionFactor > 25) {
-            expansionFactor = 25;
-        }
-        Boolean riskFilterFlag = false;
-        if (RISK_SHIELD_FILTER_FLAG_BOOL != null) {
-            try {
-                riskFilterFlag = Boolean.parseBoolean(RISK_SHIELD_FILTER_FLAG_BOOL.toLowerCase());
-            } catch (Exception e) {
-                riskFilterFlag = false;
-            }
-        }
-        param.setAppRegionFiltered(appRegionFiltered);
-        param.setVideosWithRisk(videosWithRisk);
-        param.setExpansionFactor(expansionFactor);
-        param.setRiskFilterFlag(riskFilterFlag);
+
 
         if (request.hasMachineInfo()) {
             MachineInfoProto machineInfoProto = request.getMachineInfo();
@@ -568,10 +557,7 @@ public class RecommendService {
         recallParam.setSize(param.getSize());
         recallParam.setUid(param.getUid());
         //风险过滤
-        recallParam.setExpansionFactor(param.getExpansionFactor());
-        recallParam.setRiskFilterFlag(param.getRiskFilterFlag());
-        recallParam.setVideosWithRisk(param.getVideosWithRisk());
-        recallParam.setAppRegionFiltered(param.getAppRegionFiltered());
+        recallParam.setRiskUser(param.isRiskUser());
         recallParam.setAbExpCodes(param.getAbExpCodes());
 
         recallParam.setProvince(param.getProvince());

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

@@ -24,37 +24,6 @@ public abstract class AbstractFilterService {
 
     private final ExecutorService pool = ThreadPoolFactory.filterPool();
 
-
-    private List<Long> filterWithRiskVideo(boolean riskFlag,
-                                           int appType,
-                                           String regionCode,
-                                           Map<Integer, List<String>> rules,
-                                           List<Long> videosWithRisk,
-                                           List<Long> videoIds,
-                                           int forceTruncation) {
-        if (!riskFlag) {
-            return this.truncation(videoIds, forceTruncation);
-        }
-        // 1 判断是否过滤,不展示的app+区域列表。
-        boolean filterFlag;
-        if (rules.containsKey(appType)) {
-            filterFlag = rules.get(appType).contains(regionCode);
-        } else {
-            filterFlag = true;
-        }
-        if (!filterFlag) {
-            return this.truncation(videoIds, forceTruncation);
-        }
-        // 2 开始过滤。
-        List<Long> videoIdNew = new ArrayList<>();
-        for (Long videoId : videoIds) {
-            if (!videosWithRisk.contains(videoId)) {
-                videoIdNew.add(videoId);
-            }
-        }
-        return this.truncation(videoIdNew, forceTruncation);
-    }
-
     private List<Long> truncation(List<Long> videoIds, int forceTruncation) {
         if (forceTruncation == 0) {
             return videoIds;
@@ -64,11 +33,6 @@ public abstract class AbstractFilterService {
     }
 
     protected List<Long> viewFilter(FilterParam param) {
-        // hardcode : 风险过滤会做截断，所以先同步调用
-        List<Long> riskVideoIds = filterWithRiskVideo(param.getRiskFilterFlag(),
-                param.getAppType(), param.getRegionCode(), param.getAppRegionFiltered(), param.getVideosWithRisk(),
-                param.getVideoIds(), param.getForceTruncation());
-        param.setVideoIds(riskVideoIds);
 
         List<FilterStrategy> strategies = getStrategies(param);
         CountDownLatch cdl = new CountDownLatch(strategies.size());

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

@@ -18,12 +18,8 @@ public class FilterParam {
     private String uid;
 
     // 风险过滤
-    private Boolean riskFilterFlag;
-    private Map<Integer, List<String>> appRegionFiltered;
-    private List<Long> videosWithRisk;
     private String regionCode;
     private String cityCode;
-    private int forceTruncation;
     private Set<String> abExpCodes;
 
     public boolean concurrent; // hardcode 临时解决过滤慢的问题
@@ -38,4 +34,6 @@ public class FilterParam {
 
     private String clientIp;
 
+    private boolean riskUser;
+
 }

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

@@ -1,66 +1,78 @@
 package com.tzld.piaoquan.recommend.server.service.filter.strategy;
 
+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.common.RedisKeyConstants;
+import com.tzld.piaoquan.recommend.server.repository.WxVideoTagRel;
+import com.tzld.piaoquan.recommend.server.repository.WxVideoTagRelRepository;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
 import com.tzld.piaoquan.recommend.server.service.filter.FilterStrategy;
+import com.tzld.piaoquan.recommend.server.util.CommonCollectionUtils;
+import com.tzld.piaoquan.recommend.server.util.JSONUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.PostConstruct;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author dyp
  */
 @Component
+@Slf4j
 public class RiskVideoStrategy implements FilterStrategy {
 
+    @ApolloJsonValue("${risk.video.tag:[]}")
+    private List<Long> riskVideoTagIds;
+
+    @Autowired
+    private WxVideoTagRelRepository repository;
+    // 内存持久保存不淘汰
+    private LoadingCache<String, Set<Long>> riskVideoCache = CacheBuilder.newBuilder()
+            .maximumSize(10)
+            .refreshAfterWrite(60, TimeUnit.SECONDS)
+            .expireAfterWrite(60, TimeUnit.SECONDS)
+            .expireAfterAccess(60, TimeUnit.SECONDS)
+            .build(new CacheLoader<String, Set<Long>>() {
+                @Override
+                public Set<Long> load(String key) {
+                    List<WxVideoTagRel> rels = repository.findAllByTagIdIn(riskVideoTagIds);
+                    return CommonCollectionUtils.toSet(rels, WxVideoTagRel::getVideoId);
+                }
+            });
+
     @Override
     public List<Long> filter(FilterParam param) {
-
-        if (CollectionUtils.isEmpty(param.getVideoIds())) {
+        if (param == null) {
             return Collections.emptyList();
         }
-        boolean riskFlag = param.getRiskFilterFlag();
-        int appType = param.getAppType();
-        String regionCode = param.getRegionCode();
-        Map<Integer, List<String>> rules = param.getAppRegionFiltered();
-        List<Long> videosWithRisk = param.getVideosWithRisk();
-        List<Long> videoIds = param.getVideoIds();
-
-
-        if (!riskFlag) {
-            return this.truncation(param.getVideoIds(), param.getForceTruncation());
-        }
-        // 1 判断是否过滤,不展示的app+区域列表。
-        boolean filterFlag = false;
-        if (rules.containsKey(appType)) {
-            filterFlag = false;
-            if (rules.get(appType).contains(regionCode)) {
-                filterFlag = true;
-            }
-        } else {
-            filterFlag = true;
-        }
-        if (!filterFlag) {
-            return this.truncation(videoIds, param.getForceTruncation());
-        }
-        // 2 开始过滤。
-        List<Long> videoIdNew = new ArrayList<>();
-        for (Long videoId : videoIds) {
-            if (!videosWithRisk.contains(videoId)) {
-                videoIdNew.add(videoId);
-            }
+        if (CollectionUtils.isEmpty(param.getVideoIds())) {
+            return param.getVideoIds();
         }
-        return this.truncation(videoIdNew, param.getForceTruncation());
-    }
 
-    private List<Long> truncation(List<Long> videoIds, int forceTruncation) {
-        if (forceTruncation == 0) {
-            return videoIds;
-        } else {
-            return videoIds.subList(0, Math.min(forceTruncation, videoIds.size()));
+        if (!param.isRiskUser()) {
+            return param.getVideoIds();
         }
+
+        Set<Long> riskVids = riskVideoCache.getUnchecked("");
+        List<Long> videoIds = param.getVideoIds().stream()
+                .filter(l -> !riskVids.contains(l))
+                .collect(Collectors.toList());
+
+        log.info("RiskVideoStrategy \t param={} \t before={} \t after={}",
+                JSONUtils.toJson(param),
+                JSONUtils.toJson(param.getVideoIds()),
+                JSONUtils.toJson(videoIds));
+
+        return videoIds;
     }
 }

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

@@ -20,9 +20,7 @@ public class FilterParamFactory {
         filterParam.setExpIdMap(param.getExpIdMap());
 
         // 风险过滤
-        filterParam.setRiskFilterFlag(param.getRiskFilterFlag());
-        filterParam.setVideosWithRisk(param.getVideosWithRisk());
-        filterParam.setAppRegionFiltered(param.getAppRegionFiltered());
+        filterParam.setRiskUser(param.isRiskUser());
         filterParam.setRegionCode(param.getRegionCode());
         filterParam.setAbExpCodes(param.getAbExpCodes());
         filterParam.setCityCode(param.getCityCode());
@@ -41,9 +39,7 @@ public class FilterParamFactory {
         filterParam.setExpIdMap(param.getExpIdMap());
 
         // 风险过滤
-        filterParam.setRiskFilterFlag(param.getRiskFilterFlag());
-        filterParam.setVideosWithRisk(param.getVideosWithRisk());
-        filterParam.setAppRegionFiltered(param.getAppRegionFiltered());
+        filterParam.setRiskUser(param.isRiskUser());
         filterParam.setRegionCode(param.getRegionCode());
         filterParam.setAbExpCodes(param.getAbExpCodes());
         filterParam.setCityCode(param.getCityCode());

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

@@ -30,10 +30,6 @@ public class RecallParam {
     private Long videoId;
     private String uid;
     private boolean specialRecommend;
-    private int expansionFactor;
-    private Boolean riskFilterFlag;
-    private Map<Integer, List<String>> appRegionFiltered;
-    private List<Long> videosWithRisk;
     private Set<String> abExpCodes;
     // 层 - 实验
     private Map<String, String> expIdMap;
@@ -43,4 +39,6 @@ public class RecallParam {
 
     private String clientIp;
 
+    private boolean riskUser;
+
 }

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

@@ -58,8 +58,6 @@ public class RecallService implements ApplicationContextAware {
 
     public RecallResult recall(RecallParam param) {
         List<RecallStrategy> strategies = getRecallStrategy(param);
-//        log.info("strategies {}", JSONUtils.toJson(CommonCollectionUtils.toList(strategies,
-//        o -> o.getClass().getSimpleName())));
         CountDownLatch cdl = new CountDownLatch(strategies.size());
         List<Future<RecallResult.RecallData>> recallResultFutures = new ArrayList<>();
         for (final RecallStrategy strategy : strategies) {
@@ -183,7 +181,7 @@ public class RecallService implements ApplicationContextAware {
                 strategies.addAll(getRegionRecallStrategy(param));
         }
         // 命中用户黑名单不走流量池
-        if (!hitUserBlacklist || !isInBlacklist) {
+        if (!hitUserBlacklist || !isInBlacklist || !param.isRiskUser()) {
             Set<String> abExpCodes = param.getAbExpCodes();
             if (Objects.nonNull(abExpCodes) && abExpCodes.contains(Constant.SUPPLY_AB_CODE_ID)) {
 //            if (Objects.equals(Constant.SUPPLY_AB_CODE, abCode)) {
@@ -232,30 +230,6 @@ public class RecallService implements ApplicationContextAware {
                 }
             }
         }
-//            if ("60126".equals(abCode) || "60125".equals(abCode) || "60124".equals(abCode)
-//            || "60105".equals(abCode) || "60106".equals(abCode)  || "60107".equals(abCode)
-//            || "60113".equals(abCode) || "60114".equals(abCode)
-//            || "60115".equals(abCode)){
-//                strategies.add(strategyMap.get(FlowPoolWithLevelRecallStrategyTomsonFilterDigit.class.getSimpleName()));
-//            }else{
-//                int lastDigit = param.getLastDigit();
-//                String lastDigitAB = lastDigitAbcode != null? lastDigitAbcode.getOrDefault(lastDigit, "default"): "default";
-//                switch (lastDigitAB){
-//                    case "random":
-//                        strategies.add(strategyMap.get(FlowPoolWithLevelRecallStrategyFilterDigit.class.getSimpleName()));
-//                        break;
-//                    case "tomson":
-//                        strategies.add(strategyMap.get(FlowPoolWithLevelRecallStrategyTomsonFilterDigit.class.getSimpleName()));
-//                        break;
-//                    case "score":
-//                        strategies.add(strategyMap.get(FlowPoolWithLevelScoreRecallStrategy.class.getSimpleName()));
-//                        break;
-//                    default:
-//                        strategies.add(strategyMap.get(FlowPoolWithLevelRecallStrategyFilterDigit.class.getSimpleName()));
-//                        break;
-//                }
-//            }
-
 
         //3:通过“abcode”控制“召回子策略”
         switch (abCode) {

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

@@ -61,7 +61,6 @@ public abstract class AbstractNewContentVideoRecallStrategy implements RecallStr
             }
             // 3 召回内部过滤
             FilterParam filterParam = FilterParamFactory.create(param, videoIdList);
-            filterParam.setForceTruncation(10000);
             filterParam.setConcurrent(true);
             filterParam.setNotUsePreView(false);
             FilterResult filterResult = filterService.filter(filterParam);

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

@@ -112,7 +112,7 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
 
         // 召回
         // 风险过滤 扩大因子
-        int getSize = param.getSize() * param.getExpansionFactor();
+        int getSize = param.getSize() * 5;
         int freq = 0;
         String lastVideoId = "";
         List<Video> results = new ArrayList<>();
@@ -134,7 +134,6 @@ public abstract class AbstractRegionRecallStrategy implements RecallStrategy {
                 videoMap.put(NumberUtils.toLong(t.getValue(), 0), t.getScore());
             }
             FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-            filterParam.setForceTruncation(20);
 
             FilterResult filterResult = filterService.filter(filterParam);
 

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

@@ -55,7 +55,6 @@ public class AppFallbackRecallStrategy implements RecallStrategy {
                 .map(Long::parseLong)
                 .collect(Collectors.toList());
         FilterParam filterParam = FilterParamFactory.create(param, videoIdList);
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -59,7 +59,6 @@ public class BlessRecallStrategy implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -71,7 +71,6 @@ public class CFRovnRecallStrategyV1 implements RecallStrategy {
         }
 
         FilterParam filterParam = FilterParamFactory.create(param, vids);
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -61,7 +61,6 @@ public class ContentBaseRecallStrategy implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -58,7 +58,6 @@ public class FestivalRecallStrategyV1 implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -155,7 +155,6 @@ public class FlowPoolWithLevelRecallStrategyTomson extends AbstractFlowPoolWithL
 
         // 3 召回内部过滤
         FilterParam filterParam = FilterParamFactory.create(param, new ArrayList<>(resultmap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -140,7 +140,6 @@ public class FlowPoolWithLevelRecallStrategyTomsonFilterDigit extends AbstractFl
         FilterParam filterParam = FilterParamFactory.create(param, result.stream()
                 .map(Pair::getLeft)
                 .collect(Collectors.toList()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -140,7 +140,6 @@ public class FlowPoolWithLevelRecallStrategyTomsonFilterDigitV2 extends Abstract
         FilterParam filterParam = FilterParamFactory.create(param, result.stream()
                 .map(Pair::getLeft)
                 .collect(Collectors.toList()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -155,7 +155,6 @@ public class FlowPoolWithLevelScoreRecallStrategy extends AbstractFlowPoolWithLe
 
         // 3 召回内部过滤
         FilterParam filterParam = FilterParamFactory.create(param, new ArrayList<>(resultmap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -52,7 +52,6 @@ public class RegionRealtimeRecallStrategyV1 implements RecallStrategy {
         long t1 = System.currentTimeMillis();
         // 3 召回内部过滤
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -63,7 +63,6 @@ public class RegionRealtimeRecallStrategyV1_default implements RecallStrategy {
         long t1 = System.currentTimeMillis();
         // 3 召回内部过滤
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -53,7 +53,6 @@ public class RegionRealtimeRecallStrategyV1_sort implements RecallStrategy {
         long t1 = System.currentTimeMillis();
         // 3 召回内部过滤
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -43,7 +43,6 @@ public class RegionRealtimeRecallStrategyV2 implements RecallStrategy {
         }
 
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -44,7 +44,6 @@ public class RegionRealtimeRecallStrategyV2_sort implements RecallStrategy {
         }
 
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -50,7 +50,6 @@ public class RegionRealtimeRecallStrategyV3 implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -60,7 +60,6 @@ public class RegionRealtimeRecallStrategyV3_default implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -50,7 +50,6 @@ public class RegionRealtimeRecallStrategyV3_sort implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -42,7 +42,6 @@ public class RegionRealtimeRecallStrategyV4 implements RecallStrategy {
         }
 
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -43,7 +43,6 @@ public class RegionRealtimeRecallStrategyV5HighValue implements RecallStrategy {
         }
 
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -52,7 +52,6 @@ public class RegionRealtimeRecallStrategyV6RootRov implements RecallStrategy {
         long t1 = System.currentTimeMillis();
         // 3 召回内部过滤
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -41,7 +41,6 @@ public class RegionRealtimeRecallStrategyV7VovLongTermV1 implements RecallStrate
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -41,7 +41,6 @@ public class RegionRealtimeRecallStrategyV7VovLongTermV2 implements RecallStrate
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -41,7 +41,6 @@ public class RegionRealtimeRecallStrategyV7VovLongTermV3 implements RecallStrate
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -41,7 +41,6 @@ public class RegionRealtimeRecallStrategyV7VovLongTermV4 implements RecallStrate
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -50,7 +50,6 @@ public class SceneCFRosnRecallStrategy implements RecallStrategy {
             Map<Long, Double> vid2Score = getIdScoreMap(headVid, redisValue);
             List<Long> vids = new ArrayList<>(vid2Score.keySet());
             FilterParam filterParam = FilterParamFactory.create(param, vids);
-            filterParam.setForceTruncation(10000);
             filterParam.setConcurrent(true);
             filterParam.setNotUsePreView(false);
             FilterResult filterResult = filterService.filter(filterParam);

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

@@ -50,7 +50,6 @@ public class SceneCFRovnRecallStrategy implements RecallStrategy {
             Map<Long, Double> vid2Score = getIdScoreMap(headVid, redisValue);
             List<Long> vids = new ArrayList<>(vid2Score.keySet());
             FilterParam filterParam = FilterParamFactory.create(param, vids);
-            filterParam.setForceTruncation(10000);
             filterParam.setConcurrent(true);
             filterParam.setNotUsePreView(false);
             FilterResult filterResult = filterService.filter(filterParam);

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

@@ -50,7 +50,6 @@ public class ShareDeepRecallStrategy implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -50,7 +50,6 @@ public class ShareWidthRecallStrategy implements RecallStrategy {
             videoMap.put(v.getLeft(), v.getRight());
         }
         FilterParam filterParam = FilterParamFactory.create(param, Lists.newArrayList(videoMap.keySet()));
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);

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

@@ -149,7 +149,6 @@ public class TitleTagRecallStrategyV1 implements RecallStrategy {
         }
 
         FilterParam filterParam = FilterParamFactory.create(param, sortedKeys);
-        filterParam.setForceTruncation(10000);
         filterParam.setConcurrent(true);
         filterParam.setNotUsePreView(false);
         FilterResult filterResult = filterService.filter(filterParam);