Merge branch 'feature/vlog_merge_refactor_smz_zhangbo' of algorithm/recommend-server into vlog_merge_refactor_smz

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

@@ -79,7 +79,7 @@ public class RankRouter {
             case "60124": // 546
                 return rankStrategy4RegionMergeModelV4.rank(param);
             case "60125": // 547
-                return rankStrategy4RegionMergeModelV5.rank(param);
+                return rankStrategy4RegionMergeModelV2.rank(param);
             case "60126": // 548
                 return rankStrategy4RegionMergeModelV6.rank(param);
             case "60130":

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

@@ -1,6 +1,5 @@
 package com.tzld.piaoquan.recommend.server.service.rank.strategy;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.reflect.TypeToken;

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

@@ -103,6 +103,7 @@ public class RecallService implements ApplicationContextAware {
                     strategies.addAll(getRegionRecallStrategy(param));
                     break;
                 case "60122": // 537
+                case "60125": // 547
                     strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
                     strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV2.class.getSimpleName()));
                     strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV3.class.getSimpleName()));
@@ -112,7 +113,6 @@ public class RecallService implements ApplicationContextAware {
                 case "60120": // 576
                 case "60123": // 541
                 case "60124": // 546
-                case "60125": // 547
                 case "60126": // 548
                 case "60112": // 562
                     strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));