外部流量rovn召回调整

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

@@ -53,9 +53,7 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
         List<Video> v0 = oldRovs.size() <= sizeReturn
                 ? oldRovs
                 : oldRovs.subList(0, sizeReturn);
-
         this.duplicate(setVideo, v0);
-        setVideo.addAll(v0.stream().map(Video::getVideoId).collect(Collectors.toSet()));
 
         Matcher matcher = FeatureUtils.getChannelMatcher(param.getRootSourceId());
         if (null != matcher && matcher.find() && FeatureUtils.firstLevel(param.getUserShareDepth())) {
@@ -69,12 +67,16 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             rovRecallRank.addAll(v6);
             setVideo.addAll(v6.stream().map(Video::getVideoId).collect(Collectors.toSet()));
             // 老地域
+            v0 = v0.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
             rovRecallRank.addAll(v0);
+            setVideo.addAll(v0.stream().map(Video::getVideoId).collect(Collectors.toSet()));
             // 不排序,直接返回
             return rovRecallRank;
         } else {
             // 老地域
+            v0 = v0.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
             rovRecallRank.addAll(v0);
+            setVideo.addAll(v0.stream().map(Video::getVideoId).collect(Collectors.toSet()));
             //-------------------return相似召回------------------
             List<Video> v6 = extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM);
             v6 = v6.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());