|
@@ -9,16 +9,16 @@ import com.tzld.piaoquan.ad.engine.service.predict.helper.NewExpInfoHelper;
|
|
import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
|
|
import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
|
|
import com.tzld.piaoquan.ad.engine.service.remote.FeatureRemoteService;
|
|
import com.tzld.piaoquan.ad.engine.service.remote.FeatureRemoteService;
|
|
import com.tzld.piaoquan.ad.engine.service.score.*;
|
|
import com.tzld.piaoquan.ad.engine.service.score.*;
|
|
-import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.AdCreativeFeatureContainer;
|
|
|
|
-import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.PidLambdaContainer;
|
|
|
|
-import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.PidLambdaForCpcContainer;
|
|
|
|
-import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.PidLambdaV2Container;
|
|
|
|
import com.tzld.piaoquan.ad.engine.service.score.convert.RequestConvert;
|
|
import com.tzld.piaoquan.ad.engine.service.score.convert.RequestConvert;
|
|
|
|
+import com.tzld.piaoquan.ad.engine.service.score.deprecated.BidRankRecommendRequestParam;
|
|
import com.tzld.piaoquan.ad.engine.service.score.deprecated.RankServiceThompsonImpl;
|
|
import com.tzld.piaoquan.ad.engine.service.score.deprecated.RankServiceThompsonImpl;
|
|
import com.tzld.piaoquan.ad.engine.service.score.deprecated.TacticsAndLRModelScoreRankService;
|
|
import com.tzld.piaoquan.ad.engine.service.score.deprecated.TacticsAndLRModelScoreRankService;
|
|
import com.tzld.piaoquan.ad.engine.service.score.deprecated.VideoAdThompsonScorerV2;
|
|
import com.tzld.piaoquan.ad.engine.service.score.deprecated.VideoAdThompsonScorerV2;
|
|
|
|
+import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.AdCreativeFeatureContainer;
|
|
|
|
+import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.PidLambdaContainer;
|
|
|
|
+import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.PidLambdaForCpcContainer;
|
|
|
|
+import com.tzld.piaoquan.ad.engine.service.score.deprecated.container.PidLambdaV2Container;
|
|
import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
|
|
import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
|
|
-import com.tzld.piaoquan.ad.engine.service.score.deprecated.BidRankRecommendRequestParam;
|
|
|
|
import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam;
|
|
import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam;
|
|
import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdItemFeature;
|
|
import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdItemFeature;
|
|
import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
|
|
import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
|
|
@@ -62,6 +62,8 @@ public class RankServiceImpl implements RankService {
|
|
@Autowired
|
|
@Autowired
|
|
private RankService687 rankService687;
|
|
private RankService687 rankService687;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private RankStrategyXGBAutoUpdateModel688 rankStrategyXGBAutoUpdateModel688;
|
|
|
|
+ @Autowired
|
|
private TacticsAndLRModelScoreRankService tacticsAndFmModelScoreRankService;
|
|
private TacticsAndLRModelScoreRankService tacticsAndFmModelScoreRankService;
|
|
|
|
|
|
@Value("${ad.model.cpm.max:200}")
|
|
@Value("${ad.model.cpm.max:200}")
|
|
@@ -87,10 +89,12 @@ public class RankServiceImpl implements RankService {
|
|
return rankBy680(requestParam);
|
|
return rankBy680(requestParam);
|
|
} else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "683")) {
|
|
} else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "683")) {
|
|
return rankBy683(requestParam);
|
|
return rankBy683(requestParam);
|
|
- }else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "687")){
|
|
|
|
|
|
+ } else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "687")) {
|
|
return rankBy687(requestParam);
|
|
return rankBy687(requestParam);
|
|
} else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, tacticsAndFmModelScoreExpCode)) {
|
|
} else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, tacticsAndFmModelScoreExpCode)) {
|
|
return rankBy679(requestParam);
|
|
return rankBy679(requestParam);
|
|
|
|
+ } else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "688")) {
|
|
|
|
+ return rankStrategyXGBAutoUpdateModel688(requestParam);
|
|
} else {
|
|
} else {
|
|
return adItemRankWithVideoAdThompson(requestParam);
|
|
return adItemRankWithVideoAdThompson(requestParam);
|
|
}
|
|
}
|
|
@@ -117,6 +121,13 @@ public class RankServiceImpl implements RankService {
|
|
return adRankItems.get(0);
|
|
return adRankItems.get(0);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private AdRankItem rankStrategyXGBAutoUpdateModel688(RankRecommendRequestParam request) {
|
|
|
|
+ ScoreParam scoreParam = RequestConvert.requestConvert(request);
|
|
|
|
+ List<AdRankItem> adRankItems = rankStrategyXGBAutoUpdateModel688.adItemRank(request, scoreParam);
|
|
|
|
+ logHubService.scoreLogUpload(scoreParam, request.getAdIdList(), adRankItems, request, "688");
|
|
|
|
+ return adRankItems.get(0);
|
|
|
|
+ }
|
|
|
|
+
|
|
private AdRankItem rankBy679(RankRecommendRequestParam requestParam) {
|
|
private AdRankItem rankBy679(RankRecommendRequestParam requestParam) {
|
|
ScoreParam scoreParam = RequestConvert.requestConvert(requestParam);
|
|
ScoreParam scoreParam = RequestConvert.requestConvert(requestParam);
|
|
List<AdRankItem> adRankItems = tacticsAndFmModelScoreRankService.adItemRank(requestParam, scoreParam);
|
|
List<AdRankItem> adRankItems = tacticsAndFmModelScoreRankService.adItemRank(requestParam, scoreParam);
|