Merge branch 'feature_20240527_zhaohaipeng_debug_log' into test

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/RandomPredictModel.java

@@ -39,7 +39,7 @@ public class RandomPredictModel extends ThresholdPredictModel {
                 ).toString());
         threshold=threshold*correction;
         Map<String, Object> result = new HashMap<>();
-        result.put("ad_predict", score<threshold?2:1);
+        result.put("ad_predict", 2);
         result.put("score", score);
         result.put("threshold", threshold);
         result.put("model", "random");

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

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.ad.engine.service.score.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON;
 import com.tzld.piaoquan.ad.engine.service.score.VideoAdThompsonScorerV2;
 import com.tzld.piaoquan.ad.engine.service.score.container.AdCreativeFeatureContainer;
 import com.tzld.piaoquan.ad.engine.service.score.container.PidLambdaContainer;
@@ -239,16 +240,17 @@ public class RankServiceImpl implements RankService {
         }
 
         // 兜底方案
-        List<AdRankItem> rankResult=null;
-        if(expCodes.contains("663")){
+        List<AdRankItem> rankResult = null;
+        if (expCodes.contains("663")) {
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp663(param, request.getAdIdList());
-        }else if(expCodes.contains("664")){
+        } else if (expCodes.contains("664")) {
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp664(param, request.getAdIdList());
-        }else if(expCodes.contains("665")){
+        } else if (expCodes.contains("665")) {
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp665(param, request.getAdIdList());
-        }else if(expCodes.contains("666")){
+        } else if (expCodes.contains("666")) {
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp666(param, request.getAdIdList());
         }
+        log.info("RankServiceImpl.adItemRankWithVideoAdThompson.adIdList: {}, result: {}", JSON.toJSONString(request.getAdIdList()), JSON.toJSONString(rankResult));