merge filter service

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/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

@@ -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();