Merge branch 'sunxy-festival_exp' of algorithm/recommend-server into master

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

@@ -75,7 +75,8 @@ public class RankRouter {
             case "60126": // 548
                 return rankStrategy4RegionMergeModelV6.rank(param);
             case "60130":
-                // 先走默认排序，后续需要优化祝福类的视频排序
+            case "60131":
+            case "60132":
                 return festivalStrategy4RankModel.rank(param);
             default:
                 break;

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

@@ -177,6 +177,8 @@ public class RecallService implements ApplicationContextAware {
                     strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
                     break;
                 case "60130":
+                case "60131":
+                case "60132":
                     strategies.add(strategyMap.get(SimHotVideoRecallStrategy.class.getSimpleName()));
                     strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
                     strategies.add(strategyMap.get(FestivalRecallStrategyV1.class.getSimpleName()));