节日过滤功能

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

@@ -161,9 +161,6 @@ public class RankService {
             // merge sim recall 和 return recall
             rovRecallRank.addAll(extractAndSort(param, SimHotVideoRecallStrategy.PUSH_FORM));
             rovRecallRank.addAll(extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM));
-
-            rovRecallRank.addAll(extractAndSort(param, DahanRecallStrategy.PUSH_FORM));
-
             removeDuplicate(rovRecallRank);
 
             // 融合排序

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

@@ -142,8 +142,8 @@ public class RankStrategy4Density extends RankService {
         List<Video> flowPoolRankNew = flowPoolRank.stream().filter(r -> !videosSet.contains(r.getVideoId())).collect(Collectors.toList());
         List<Video> resultWithDnsity = RankProcessorDensity.mergeDensityControl(result,
                 rovRecallRankNew, flowPoolRankNew, densityRules);
-        log.info("zhangbo22 old={}, new={}", JSONUtils.toJson(result),
-                    JSONUtils.toJson(resultWithDnsity));
+//        log.info("zhangbo22 old={}, new={}", JSONUtils.toJson(result),
+//                    JSONUtils.toJson(resultWithDnsity));
         return new RankResult(resultWithDnsity);
     }
 

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

@@ -120,10 +120,9 @@ public class RecallService implements ApplicationContextAware {
                 case "60118":
                 case "60119":
                 case "60096":
-//                    strategies.add(strategyMap.get(RegionHWithoutDupRecallStrategy.class.getSimpleName()));
-//                    strategies.add(strategyMap.get(SimHotVideoRecallStrategy.class.getSimpleName()));
-//                    strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
-                    strategies.add(strategyMap.get(DahanRecallStrategy.class.getSimpleName()));
+                    strategies.add(strategyMap.get(RegionHWithoutDupRecallStrategy.class.getSimpleName()));
+                    strategies.add(strategyMap.get(SimHotVideoRecallStrategy.class.getSimpleName()));
+                    strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
                     break;
                 case "60107":
                 case "60106":