|
@@ -24,6 +24,7 @@ import com.tzld.piaoquan.ad.engine.service.predict.param.request.RoiPredictModel
|
|
|
import com.tzld.piaoquan.ad.engine.service.predict.param.request.ThresholdPredictModelRequestParam;
|
|
|
import com.tzld.piaoquan.ad.engine.service.predict.v2.ConvertUtil;
|
|
|
import com.tzld.piaoquan.ad.engine.service.predict.v2.PredictServiceV2;
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -84,6 +85,9 @@ public class PredictModelServiceImpl implements PredictModelService {
|
|
|
@Value("${advance.show.ad.switch:true}")
|
|
|
private boolean advanceShowAdSwitch;
|
|
|
|
|
|
+ @Value("#{'${show.ad.whitelist.mid:}'.split(',')}")
|
|
|
+ private Set<String> showAdWhitelistMidSet;
|
|
|
+
|
|
|
@Autowired
|
|
|
private AdRedisHelper adRedisHelper;
|
|
|
|
|
@@ -145,6 +149,12 @@ 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));
|