Merge branch 'feature_20240909_zhaohaipeng_xgb_auto_update' into pre-master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -10,16 +10,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.remote.FeatureRemoteService;
 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.deprecated.BidRankRecommendRequestParam;
 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.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.deprecated.BidRankRecommendRequestParam;
 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.AdRankItem;
@@ -63,6 +63,8 @@ public class RankServiceImpl implements RankService {
     @Autowired
     private RankService687 rankService687;
     @Autowired
+    private RankStrategyXGBAutoUpdateModel688 rankStrategyXGBAutoUpdateModel688;
+    @Autowired
     private TacticsAndLRModelScoreRankService tacticsAndFmModelScoreRankService;
 
     @Value("${ad.model.cpm.max:200}")
@@ -88,10 +90,12 @@ public class RankServiceImpl implements RankService {
             return rankBy680(requestParam);
         } else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "683")) {
             return rankBy683(requestParam);
-        }else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "687")){
+        } else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "687")) {
             return rankBy687(requestParam);
         } else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, tacticsAndFmModelScoreExpCode)) {
             return rankBy679(requestParam);
+        } else if (AbUtil.isInAbExp(expCodeSet, appType, newExpGroup, "688")) {
+            return rankStrategyXGBAutoUpdateModel688(requestParam);
         } else {
             return adItemRankWithVideoAdThompson(requestParam);
         }
@@ -118,6 +122,13 @@ public class RankServiceImpl implements RankService {
         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) {
         ScoreParam scoreParam = RequestConvert.requestConvert(requestParam);
         List<AdRankItem> adRankItems = tacticsAndFmModelScoreRankService.adItemRank(requestParam, scoreParam);