|
@@ -65,7 +65,17 @@ public class RankService {
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
+ // 1 通过 apptype 判断该小程序走怎样的排序策略。
|
|
|
+ if (param.getAppType() == AppTypeEnum.PIAO_QUAN_ZHU_FU.getCode()){
|
|
|
+ List<Video> results = new ArrayList<>();
|
|
|
+ results.addAll(extractAndSort(param, FestivalRecallStrategyV1.PUSH_FORM));
|
|
|
+ results.addAll(extractAndSort(param, RegionRealtimeRecallStrategyV2.PUSH_FORM));
|
|
|
+ results.addAll(extractAndSort(param, RegionRealtimeRecallStrategyV3.PUSH_FORM));
|
|
|
+ removeDuplicate(results);
|
|
|
+ return new RankResult(results);
|
|
|
+ }
|
|
|
|
|
|
+ // 2 正常走分发 排序+冷启动
|
|
|
List<Video> rovRecallRank = mergeAndRankRovRecall(param);
|
|
|
// log.info("mergeAndRankRovRecall rovRecallRank={}", JSONUtils.toJson(rovRecallRank));
|
|
|
List<Video> flowPoolRank = mergeAndRankFlowPoolRecall(param);
|
|
@@ -90,14 +100,7 @@ public class RankService {
|
|
|
public List<Video> mergeAndRankRovRecall(RankParam param) {
|
|
|
// TODO ab test
|
|
|
// TODO 抽象成Strategy
|
|
|
-// boolean hitTest = newRankSwitch
|
|
|
-// || CommonCollectionUtils.contains(param.getAbExpCodes(), newRankAbExpCode);
|
|
|
-// if (hitTest) {
|
|
|
-// return mergeAndRankRovRecallNew(param);
|
|
|
-// } else {
|
|
|
-// return mergeAndRankRovRecallOld(param);
|
|
|
-// }
|
|
|
- // 研发重写了代码,直接走新逻辑
|
|
|
+
|
|
|
return mergeAndRankRovRecallOld(param);
|
|
|
}
|
|
|
|