|
|
@@ -106,7 +106,10 @@ public class PredictModelServiceImpl implements PredictModelService {
|
|
|
@Value("#{'${show.ad.whitelist.mid:}'.split(',')}")
|
|
|
private Set<String> showAdWhitelistMidSet;
|
|
|
|
|
|
- @Value("${experiment.817.ad.hour:0,8}")
|
|
|
+ @Value("#{'${show.ad.blacklist.mid:}'.split(',')}")
|
|
|
+ private Set<String> showAdBlacklistMidSet;
|
|
|
+
|
|
|
+ @Value("${experiment.817.ad.hour:5,8}")
|
|
|
private String experiment817WithAdHour;
|
|
|
|
|
|
@Autowired
|
|
|
@@ -128,6 +131,10 @@ public class PredictModelServiceImpl implements PredictModelService {
|
|
|
result.put("ad_predict", 2);
|
|
|
result.put("ad_strategy", "show_ad_whitelist");
|
|
|
return result;
|
|
|
+ } else if (CollectionUtils.isNotEmpty(showAdBlacklistMidSet) && showAdBlacklistMidSet.contains(requestParam.getMid())) {
|
|
|
+ result.put("ad_predict", 1);
|
|
|
+ result.put("ad_strategy", "show_ad_blacklist");
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
try {
|
|
|
@@ -212,7 +219,7 @@ public class PredictModelServiceImpl implements PredictModelService {
|
|
|
}else {
|
|
|
return predictStrategyBy599.predict(predictContext);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
} catch (Exception e) {
|
|
|
log.error("svc=adPredict appType={} group={} newGroup={} pqtId={}"
|
|
|
, requestParam.getAppType(), requestParam.getAbTestCode(), requestParam.getNewExpGroup(), requestParam.getPqtId(), e);
|