Merge branch 'feature_gufengshou_20240515_video_ad_thompson' into pre-master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -235,7 +235,7 @@ public class PredictModelServiceImpl implements PredictModelService {
                     getThresholdPredictModel(thresholdMixFunc.toString())
                     .predict(modelParam);
         }
-
+        result.put("logTraceId", requestParam.getLogTraceId());
         return result;
     }
 

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/param/request/ThresholdPredictModelRequestParam.java

@@ -24,6 +24,6 @@ public class ThresholdPredictModelRequestParam {
     String region = "-1";
     //市-中文
     String city = "-1";
-
+    String logTraceId;
     MachineInfoParam machineInfo = new MachineInfoParam();
 }

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

@@ -155,7 +155,8 @@ public class RankServiceImpl implements RankService {
             object.put("lrsamples",rankResult.get(0).getLrSampleString());
             object.put("dataTime",currentTime.format(timeFormatter));
             object.put("creativeId",rankResult.get(0).getAdId());
-            object.put("videoId", rankResult.get(0).getVideoId());
+            object.put("videoId", request.getVideoId());
+            object.put("logTraceId", request.getLogTraceId());
             log.info("svc=adItemRank {}", JSONObject.toJSONString(object));
             object.remove("lrsamples");
             if(inCpcPidExp){
@@ -245,6 +246,7 @@ public class RankServiceImpl implements RankService {
             object.put("dataTime",currentTime.format(timeFormatter));
             object.put("creativeId",rankResult.get(0).getAdId());
             object.put("videoId", rankResult.get(0).getVideoId());
+            object.put("logTraceId", request.getLogTraceId());
             log.info("svc=videoAdThompsonRank_lr_log {}", JSONObject.toJSONString(object));
             object.remove("lrsamples");
             object.put("score_500",rankResult.get(0).getTf_ctr());
@@ -392,7 +394,7 @@ public class RankServiceImpl implements RankService {
         object.put("pcvr",topItem.getCvr());
         object.put("lrsamples",topItem.getLrSampleString());
         object.put("pidLambda",topItem.getPidLambda());
-        object.put("videoId", rankResult.get(0).getVideoId());
+        object.put("videoId", request.getVideoId());
 
         //临时加入供pid v2使用
         object.put("realECpm",realECpm);
@@ -401,6 +403,7 @@ public class RankServiceImpl implements RankService {
         object.put("cpa",dto.getCpa()*dto.getBid1());
         object.put("oCpa",dto.getCpa());
         object.put("dataTime",currentTime.format(timeFormatter));
+        object.put("logTraceId", request.getLogTraceId());
         log.info("svc=adBidRank {}", JSONObject.toJSONString(object));
         object.remove("lrsamples");
         log.info("svc=pid_log obj={}", JSONObject.toJSONString(object));
@@ -519,10 +522,11 @@ public class RankServiceImpl implements RankService {
         object.put("pidLambda",topItem.getPidLambda());
         object.put("realECpm",realECpm);
         object.put("creativeId",result.getCreativeId());
-        object.put("videoId", rankResult.get(0).getVideoId());
+        object.put("videoId", request.getVideoId());
         //CPA还原
         object.put("cpa",dto.getCpa()*dto.getBid1());
         object.put("oCpa",dto.getCpa());
+        object.put("logTraceId", request.getLogTraceId());
         object.put("dataTime",currentTime.format(timeFormatter));
         log.info("svc=adBidRankNewPid {}", JSONObject.toJSONString(object));
         object.remove("lrsamples");

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

@@ -19,6 +19,6 @@ public class RecommendRequestParam {
     //市-中文
     String city = "-1";
     Integer newExpGroup;
-
+    String logTraceId;
     List<Map> adAbExpArr ;
 }