Merge branch 'master' into feature/zhangbo_rank

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/AbstractFilterService.java

@@ -53,9 +53,9 @@ public abstract class AbstractFilterService {
         obj.put("concurrent", param.concurrent);
         obj.put("notUsePreView", param.notUsePreView);
         obj.put("size1", videoIds.size());
-        if (param.isNotUsePreView()){
-           ;
-        }else {
+        if (param.isNotUsePreView()) {
+            ;
+        } else {
             videoIds = filterByPreViewed(param.getAppType(), param.getMid(), videoIds);
         }
         obj.put("size2", videoIds.size());
@@ -241,11 +241,8 @@ public abstract class AbstractFilterService {
         if (CollectionUtils.isEmpty(videoIds)) {
             return Collections.emptyList();
         }
-        List<Long> result = videoIds.get(0);
-        if (CollectionUtils.isEmpty(result)) {
-            return Collections.emptyList();
-        }
-        for (int i = 1; i < videoIds.size(); ++i) {
+        List<Long> result = new ArrayList<>();
+        for (int i = 0; i < videoIds.size(); ++i) {
             result.retainAll(videoIds.get(i));
         }
         log.info("filter result {}", JSONUtils.toJson(result));

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

@@ -35,8 +35,6 @@ public class FestivalStrategy4RankModel extends RankService {
         rovRecallRank.addAll(extractAndSort(param, Region24HRecallStrategy.PUSH_FORM));
         rovRecallRank.addAll(extractAndSort(param, RegionRelative24HRecallStrategy.PUSH_FORM));
         rovRecallRank.addAll(extractAndSort(param, RegionRelative24HDupRecallStrategy.PUSH_FORM));
-        rovRecallRank.addAll(extractAndSort(param, SimHotVideoRecallStrategy.PUSH_FORM));
-        rovRecallRank.addAll(extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM));
         List<Video> festivalRecallVideoList = extractAndSort(param, FestivalRecallStrategyV1.PUSH_FORM);
         // 截断
         if (CollectionUtils.isNotEmpty(festivalRecallVideoList)) {