|
@@ -40,7 +40,6 @@ public abstract class RankService {
|
|
|
if (2 == param.getRecommendType()) {
|
|
if (2 == param.getRecommendType()) {
|
|
|
tagDuplicateVideos(param);
|
|
tagDuplicateVideos(param);
|
|
|
List<Video> rovRecallRank = mergeAndRankRovRecall(param);
|
|
List<Video> rovRecallRank = mergeAndRankRovRecall(param);
|
|
|
- this.addPushFromVideoRank(rovRecallRank);
|
|
|
|
|
return new RankResult(rovRecallRank);
|
|
return new RankResult(rovRecallRank);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -93,11 +92,8 @@ public abstract class RankService {
|
|
|
|
|
|
|
|
List<Video> douHotFlowPoolRank = extractAndSort(param, DouHotFlowPoolRecallStrategy.PUSH_FROM);
|
|
List<Video> douHotFlowPoolRank = extractAndSort(param, DouHotFlowPoolRecallStrategy.PUSH_FROM);
|
|
|
|
|
|
|
|
- this.addPushFromVideoRank(rovRecallRank);
|
|
|
|
|
-
|
|
|
|
|
removeDuplicate(param, rovRecallRank, flowPoolRank, douHotFlowPoolRank);
|
|
removeDuplicate(param, rovRecallRank, flowPoolRank, douHotFlowPoolRank);
|
|
|
|
|
|
|
|
-
|
|
|
|
|
// 融合排序
|
|
// 融合排序
|
|
|
return mergeAndSort(param, rovRecallRank, flowPoolRank, douHotFlowPoolRank);
|
|
return mergeAndSort(param, rovRecallRank, flowPoolRank, douHotFlowPoolRank);
|
|
|
}
|
|
}
|
|
@@ -269,7 +265,7 @@ public abstract class RankService {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void addPushFromVideoRank(List<Video> rankVideo) {
|
|
|
|
|
|
|
+ protected void addPushFromVideoRank(List<Video> rankVideo) {
|
|
|
try {
|
|
try {
|
|
|
Map<String, List<Long>> pushFromVideoRank = new HashMap<>();
|
|
Map<String, List<Long>> pushFromVideoRank = new HashMap<>();
|
|
|
for (Video video : rankVideo) {
|
|
for (Video video : rankVideo) {
|