|
@@ -97,6 +97,14 @@ public class PredictModelServiceImpl implements PredictModelService {
|
|
|
public Map<String, Object> adPredict(ThresholdPredictModelRequestParam requestParam) {
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
result.put("pqtId", requestParam.getPqtId());
|
|
|
+
|
|
|
+ // 白名单用户固定出广告
|
|
|
+ if (CollectionUtils.isNotEmpty(showAdWhitelistMidSet) && showAdWhitelistMidSet.contains(requestParam.getMid())) {
|
|
|
+ result.put("ad_predict", 2);
|
|
|
+ result.put("ad_strategy", "show_ad_whitelist");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
try {
|
|
|
String[] withoutAdVideoIdsArr = withoutAdVideoIds.split(",");
|
|
|
for (String videoId : withoutAdVideoIdsArr) {
|
|
@@ -149,13 +157,6 @@ public class PredictModelServiceImpl implements PredictModelService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- // 白名单用户固定出广告
|
|
|
- if (CollectionUtils.isNotEmpty(showAdWhitelistMidSet) && showAdWhitelistMidSet.contains(requestParam.getMid())) {
|
|
|
- result.put("ad_predict", 2);
|
|
|
- result.put("ad_strategy", "show_ad_whitelist");
|
|
|
- return result;
|
|
|
- }
|
|
|
-
|
|
|
if (AbUtil.isInAbExp(expCodes, requestParam.getAppType(), requestParam.getNewExpGroup(), "713")){
|
|
|
return predictServiceV2.adPredict(ConvertUtil.predictParam2Context(requestParam));
|
|
|
}
|