Merge branch 'master' into feature/zhangbo_rank

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

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

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

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class FlowPoolLastDayTopRecallStrategy extends AbstractFlowPoolTopRecallStrategy {
 
-    private static final String PUSH_FORM = "flow_pool_top_video_recall";
+    public static final String PUSH_FORM = "flow_pool_top_video_recall";
 
     @Override
     public String pushFrom() {