merge filter service

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

@@ -3,6 +3,8 @@ package com.tzld.piaoquan.recommend.server.service.filter;
 import com.google.common.collect.Lists;
 import com.tzld.piaoquan.recommend.server.common.ThreadPoolFactory;
 import com.tzld.piaoquan.recommend.server.service.ServiceBeanFactory;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterParam;
+import com.tzld.piaoquan.recommend.server.service.filter.FilterStrategy;
 import com.tzld.piaoquan.recommend.server.service.filter.strategy.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -10,7 +12,6 @@ import org.apache.commons.collections4.CollectionUtils;
 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 +21,16 @@ import java.util.concurrent.TimeUnit;
  * @author dyp
  */
 @Slf4j
-public abstract class AbstractFilterService {
+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/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) {

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;