|
@@ -7,10 +7,7 @@ import com.tzld.piaoquan.recommend.server.model.Video;
|
|
|
import com.tzld.piaoquan.recommend.server.service.rank.RankParam;
|
|
import com.tzld.piaoquan.recommend.server.service.rank.RankParam;
|
|
|
import com.tzld.piaoquan.recommend.server.service.rank.RankResult;
|
|
import com.tzld.piaoquan.recommend.server.service.rank.RankResult;
|
|
|
import com.tzld.piaoquan.recommend.server.service.rank.RankService;
|
|
import com.tzld.piaoquan.recommend.server.service.rank.RankService;
|
|
|
-import com.tzld.piaoquan.recommend.server.service.recall.strategy.CityRovnAllRovRecallStrategy;
|
|
|
|
|
-import com.tzld.piaoquan.recommend.server.service.recall.strategy.CityRovnRecallStrategy;
|
|
|
|
|
-import com.tzld.piaoquan.recommend.server.service.recall.strategy.RegionHRecallStrategy;
|
|
|
|
|
-import com.tzld.piaoquan.recommend.server.service.recall.strategy.RegionRealtimeRecallStrategyV1;
|
|
|
|
|
|
|
+import com.tzld.piaoquan.recommend.server.service.recall.strategy.*;
|
|
|
import com.tzld.piaoquan.recommend.server.util.RecallUtils;
|
|
import com.tzld.piaoquan.recommend.server.util.RecallUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -28,6 +25,9 @@ public class RankSequenceStrategy extends RankService {
|
|
|
RegionHRecallStrategy.PUSH_FORM,
|
|
RegionHRecallStrategy.PUSH_FORM,
|
|
|
RegionRealtimeRecallStrategyV1.PUSH_FORM
|
|
RegionRealtimeRecallStrategyV1.PUSH_FORM
|
|
|
);
|
|
);
|
|
|
|
|
+ private static final List<String> personalizationRecall = Lists.newArrayList(
|
|
|
|
|
+ PersonalizationTabRovnRecallStrategy.PUSH_FROM
|
|
|
|
|
+ );
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<Video> mergeAndRankRovRecall(RankParam param) {
|
|
public List<Video> mergeAndRankRovRecall(RankParam param) {
|
|
@@ -37,6 +37,8 @@ public class RankSequenceStrategy extends RankService {
|
|
|
TabType type = TabType.getByType(tab.getType());
|
|
TabType type = TabType.getByType(tab.getType());
|
|
|
if (Objects.equals(TabType.territory, type)) {
|
|
if (Objects.equals(TabType.territory, type)) {
|
|
|
this.extractRecall(param, territoryRecall, rovRecallRank);
|
|
this.extractRecall(param, territoryRecall, rovRecallRank);
|
|
|
|
|
+ } else if (Objects.equals(TabType.personalization, type)) {
|
|
|
|
|
+ this.extractRecall(param, personalizationRecall, rovRecallRank);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -47,8 +49,9 @@ public class RankSequenceStrategy extends RankService {
|
|
|
|
|
|
|
|
private void extractRecall(RankParam param, List<String> recalls, List<Video> videos) {
|
|
private void extractRecall(RankParam param, List<String> recalls, List<Video> videos) {
|
|
|
Set<Long> setVideo = new HashSet<>();
|
|
Set<Long> setVideo = new HashSet<>();
|
|
|
|
|
+ setVideo.add(param.getHeadVid());
|
|
|
for (String recall : recalls) {
|
|
for (String recall : recalls) {
|
|
|
- RecallUtils.extractRecall(10000, param, recall, setVideo, videos);
|
|
|
|
|
|
|
+ RecallUtils.extractRecall(100, param, recall, setVideo, videos);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|