Merge branch 'master' into feature/v3_nor_model

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

@@ -77,6 +77,13 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
         sceneCFRosn = sceneCFRosn.subList(0, Math.min(mergeWeight.getOrDefault("sceneCFRosn", 5.0).intValue(), sceneCFRosn.size()));
         rovRecallRank.addAll(sceneCFRosn);
         setVideo.addAll(sceneCFRosn.stream().map(Video::getVideoId).collect(Collectors.toSet()));
+        //-------------------return相似召回------------------
+        List<Video> returnv2 = extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM);
+        returnv2 = returnv2.stream().filter(r -> !setVideo.contains(r.getVideoId())).collect(Collectors.toList());
+        returnv2 = returnv2.subList(0, Math.min(mergeWeight.getOrDefault("returnv2", 5.0).intValue(), returnv2.size()));
+        rovRecallRank.addAll(returnv2);
+        setVideo.addAll(returnv2.stream().map(Video::getVideoId).collect(Collectors.toSet()));
+
 
         //-------------------排-------------------
         //-------------------序-------------------

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

@@ -110,7 +110,7 @@ public class RecallService implements ApplicationContextAware {
         strategies.add(strategyMap.get(SceneCFRosnRecallStrategy.class.getSimpleName()));
         Set<String> abExpCodes = param.getAbExpCodes();
         if (CollectionUtils.isNotEmpty(abExpCodes) && abExpCodes.contains("568")) {
-            strategies.remove(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
+            // strategies.remove(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
             strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV7LongTermV1.class.getSimpleName()));
         }