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

@@ -49,6 +49,8 @@ public class RankRouter {
             return rankService.rank(param);
         }
         switch (abCode) {
+            case "60097":
+                return rankStrategy4Density.rank(param);
             case "60106":
                 return rankStrategy4Rankv2Model.rank(param);
             case "60101":
@@ -64,8 +66,6 @@ public class RankRouter {
             case "60116":
             case "60117":
             case "60118":
-            case "60119":
-                return rankStrategy4Density.rank(param);
             case "60107": // 556
                 return rankStrategyFlowThompsonModel.rank(param);
             case "60120": // 576

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

@@ -35,8 +35,8 @@ public class RankStrategy4Density extends RankService {
     @Override
     public RankResult mergeAndSort(RankParam param, List<Video> rovVideos, List<Video> flowVideos) {
 
-         //1 兜底策略，rov池子不足时，用冷启池填补。直接返回。
-        if (CollectionUtils.isEmpty(rovVideos) || filterRules == null || filterRules.isEmpty()) {
+        //1 兜底策略，rov池子不足时，用冷启池填补。直接返回。
+        if (CollectionUtils.isEmpty(rovVideos)) {
             if (param.getSize() < flowVideos.size()) {
                 return new RankResult(flowVideos.subList(0, param.getSize()));
             } else {