ADD：category_id

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

@@ -55,5 +55,7 @@ public class RecommendParam {
     // 层 - 实验
     private Map<String, String> expIdMap;
 
+    private Integer categoryId;
+
 }
 

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

@@ -432,6 +432,8 @@ public class RecommendService {
             }
         }
 
+        param.setCategoryId(Integer.parseInt(request.getCategoryId()));
+
         return param;
     }
 
@@ -514,7 +516,7 @@ public class RecommendService {
 
         recallParam.setProvince(param.getProvince());
         recallParam.setExpIdMap(param.getExpIdMap());
-
+        recallParam.setCategoryId(param.getCategoryId());
 
         return recallParam;
     }
@@ -555,7 +557,7 @@ public class RecommendService {
         rankParam.setMachineInfo(param.getMachineInfo());
         rankParam.setAbExpCodes(param.getAbExpCodes());
         rankParam.setExpIdMap(param.getExpIdMap());
-
+        rankParam.setCategoryId(param.getCategoryId());
         return rankParam;
     }
 

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

@@ -29,4 +29,6 @@ public class RankParam {
     // 层 - 实验
     private Map<String, String> expIdMap;
 
+    private Integer categoryId;
+
 }

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

@@ -66,7 +66,7 @@ public class RankService {
             return null;
         }
         // 1 通过 apptype 判断该小程序走怎样的排序策略。
-        if (param.getAppType() == AppTypeEnum.PIAO_QUAN_MEIHAO_ZHUFU.getCode()){
+        if (param.getAppType() == AppTypeEnum.PIAO_QUAN_MEIHAO_ZHUFU.getCode() && Objects.equals(param.getCategoryId(), 100)) {
             List<Video> results = new ArrayList<>();
             results.addAll(extractAndSort(param, BlessRecallStrategy.PUSH_FORM));
             List<String> videoIdKeys = results.stream()
@@ -100,7 +100,6 @@ public class RankService {
     }
 
     public void rankFilter(RankParam param, List<Video> rovRecallRank, List<Video> flowPoolRank) {
-        return;
     }
 
     public List<Video> mergeAndRankRovRecall(RankParam param) {

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

@@ -35,5 +35,6 @@ public class RecallParam {
     private Set<String> abExpCodes;
     // 层 - 实验
     private Map<String, String> expIdMap;
+    private Integer categoryId;
 
 }

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

@@ -5,7 +5,6 @@ import com.tzld.piaoquan.recommend.server.common.enums.AppTypeEnum;
 import com.tzld.piaoquan.recommend.server.model.Video;
 import com.tzld.piaoquan.recommend.server.service.flowpool.FlowPoolConstants;
 import com.tzld.piaoquan.recommend.server.service.recall.strategy.*;
-import com.tzld.piaoquan.recommend.server.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeansException;
@@ -14,10 +13,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -32,7 +28,7 @@ public class RecallService implements ApplicationContextAware {
 
     private final Map<String, RecallStrategy> strategyMap = new HashMap<>();
     private ApplicationContext applicationContext;
-    private ExecutorService pool = ThreadPoolFactory.recallPool();
+    private final ExecutorService pool = ThreadPoolFactory.recallPool();
 
     @PostConstruct
     public void init() {
@@ -88,7 +84,7 @@ public class RecallService implements ApplicationContextAware {
         if (param.getAppType() == AppTypeEnum.LAO_HAO_KAN_VIDEO.getCode()
                 || param.getAppType() == AppTypeEnum.ZUI_JING_QI.getCode()) {
             strategies.addAll(getRegionRecallStrategy(param));
-        } else if (param.getAppType() == AppTypeEnum.PIAO_QUAN_MEIHAO_ZHUFU.getCode()) {
+        } else if (param.getAppType() == AppTypeEnum.PIAO_QUAN_MEIHAO_ZHUFU.getCode() && Objects.equals(param.getCategoryId(), 100)) {
             strategies.add(strategyMap.get(BlessRecallStrategy.class.getSimpleName()));
             strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV2.class.getSimpleName()));
             strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV3.class.getSimpleName()));
@@ -148,7 +144,6 @@ public class RecallService implements ApplicationContextAware {
 
         if (abCode == null) {
             // todo 做兜底吗？
-            ;
         } else {
             switch (abCode) {