Merge branch 'feature_20240816_zhaohaipeng_xgboost_v2' of algorithm/ad-engine into master

ad-engine-server/src/main/resources/ad_score_config_xgboost_351.conf

@@ -1,8 +0,0 @@
-scorer-config = {
-  lr-rov-score-config = {
-    scorer-name = "com.tzld.piaoquan.ad.engine.service.score.XGBoostScorer"
-    scorer-priority = 99
-    model-path = "zhangbo/model_xgb_1000.tar.gz"
-  }
-
-}

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

@@ -5,7 +5,6 @@ import com.tzld.piaoquan.ad.engine.commons.score.BaseXGBoostModelScorer;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.commons.score.ScorerConfigInfo;
 import com.tzld.piaoquan.ad.engine.commons.score.model.XGBoostModel683;
-import com.tzld.piaoquan.ad.engine.commons.score.model.XGBoostModel;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.UserAdFeature;
 import org.apache.commons.collections4.CollectionUtils;
@@ -59,10 +58,10 @@ public class XGBoostScorer683 extends BaseXGBoostModelScorer {
     }
 
     private List<AdRankItem> rankByJava(final Map<String, String> sceneFeatureMap,
-                                      final Map<String, String> userFeatureMap,
-                                      final List<AdRankItem> items) {
+                                        final Map<String, String> userFeatureMap,
+                                        final List<AdRankItem> items) {
         long startTime = System.currentTimeMillis();
-        XGBoostModel model = (XGBoostModel) this.getModel();
+        XGBoostModel683 model = (XGBoostModel683) this.getModel();
         LOGGER.debug("model size: [{}]", model.getModelSize());
 
         // 所有都参与打分，按照ctr排序
@@ -86,7 +85,7 @@ public class XGBoostScorer683 extends BaseXGBoostModelScorer {
     private void multipleCtrScore(final List<AdRankItem> items,
                                   final Map<String, String> userFeatureMap,
                                   final Map<String, String> sceneFeatureMap,
-                                  final XGBoostModel model) {
+                                  final XGBoostModel683 model) {
 
         List<Callable<Object>> calls = new ArrayList<Callable<Object>>();
         for (int index = 0; index < items.size(); index++) {
@@ -129,7 +128,7 @@ public class XGBoostScorer683 extends BaseXGBoostModelScorer {
         }
     }
 
-    public double calcScore(final XGBoostModel model,
+    public double calcScore(final XGBoostModel683 model,
                             final AdRankItem item,
                             final Map<String, String> userFeatureMap,
                             final Map<String, String> sceneFeatureMap) {