|
@@ -6,6 +6,7 @@ import com.tzld.piaoquan.recommend.server.common.enums.AppTypeEnum;
|
|
|
import com.tzld.piaoquan.recommend.server.model.Video;
|
|
|
import com.tzld.piaoquan.recommend.server.service.recall.strategy.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeansException;
|
|
|
import org.springframework.context.ApplicationContext;
|
|
@@ -105,15 +106,15 @@ public class RecallService implements ApplicationContextAware {
|
|
|
strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
|
|
|
strategies.addAll(getRegionRecallStrategy(param));
|
|
|
strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
|
|
|
- strategies.add(strategyMap.get(SceneCFRovnRecallStrategy.class.getSimpleName()));
|
|
|
- strategies.add(strategyMap.get(SceneCFRosnRecallStrategy.class.getSimpleName()));
|
|
|
-
|
|
|
-// Set<String> abExpCodes = param.getAbExpCodes();
|
|
|
-// if (CollectionUtils.isNotEmpty(abExpCodes)) {
|
|
|
-// if (abExpCodes.contains("563") || abExpCodes.contains("562")
|
|
|
-// || abExpCodes.contains("564")) {
|
|
|
-// }
|
|
|
-// }
|
|
|
+
|
|
|
+ Set<String> abExpCodes = param.getAbExpCodes();
|
|
|
+ if (CollectionUtils.isNotEmpty(abExpCodes)) {
|
|
|
+ if (abExpCodes.contains("563") || abExpCodes.contains("562")
|
|
|
+ || abExpCodes.contains("564") || abExpCodes.contains("567")) {
|
|
|
+ strategies.add(strategyMap.get(SceneCFRovnRecallStrategy.class.getSimpleName()));
|
|
|
+ strategies.add(strategyMap.get(SceneCFRosnRecallStrategy.class.getSimpleName()));
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
// 命中用户黑名单不走流量池
|
|
|
if (!param.isRiskUser()) {
|