Merge branch 'feature/zhangbo_model' of algorithm/recommend-server into feature_feature

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

@@ -48,7 +48,7 @@ public class RankRouter {
     @Autowired
     private RankStrategy4RegionMergeModelV567 rankStrategy4RegionMergeModelV567;
     @Autowired
-    private RankStrategy4RegionMergeModelV568 rankStrategy4RegionMergeModelV568;
+    private RankStrategy4RegionMergeModelV999 rankStrategy4RegionMergeModelV999;
     @Autowired
     private RankStrategy4RegionMergeModelV569 rankStrategy4RegionMergeModelV569;
     @Autowired
@@ -91,7 +91,7 @@ public class RankRouter {
             case "60117": // 567
                 return rankStrategy4RegionMergeModelV567.rank(param);
             case "60118": // 568
-                return rankStrategy4RegionMergeModelV568.rank(param);
+                return rankStrategy4RegionMergeModelV999.rank(param);
             case "60119": // 569
                 return rankStrategy4RegionMergeModelV569.rank(param);
             case "60120": // 576

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

@@ -22,7 +22,7 @@ import java.io.InputStreamReader;
 @Service
 @Slf4j
 public class RankStrategy4RegionMergeModelV999 extends RankStrategy4RegionMergeModelBasic {
-    @ApolloJsonValue("${rank.score.merge.weightv567:}")
+    @ApolloJsonValue("${rank.score.merge.weightv568:}")
     private Map<String, Double> mergeWeight;
 
     @Autowired

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

@@ -160,9 +160,12 @@ public class RecallService implements ApplicationContextAware {
                 strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV4.class.getSimpleName()));
                 break;
             case "60117": // 567
+                strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
+                strategies.addAll(getRegionRecallStrategy(param));
             case "60118": // 568
                 strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
                 strategies.addAll(getRegionRecallStrategy(param));
+                strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
             case "60119": // 569
                 strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
                 strategies.add(strategyMap.get(TitleTagRecallStrategyV1.class.getSimpleName()));
@@ -287,10 +290,11 @@ public class RecallService implements ApplicationContextAware {
             case "60114": // 564
             case "60115": // 565
             case "60117": // 567
-            case "60118": // 568
             case "60104": // 去掉sim的对比实验
                 strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
                 break;
+            case "60118": // 568
+                break;
             case "60110": // 新内容的召回（流量池的Top内容）
                 strategies.add(strategyMap.get(TopGoodPerformanceVideoRecallStrategy.class.getSimpleName()));
                 if (!hitUserBlacklist || !isInBlacklist) {