feat:合并master

ad-engine-commons/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-feature-client</artifactId>
-            <version>1.1.19</version>
+            <version>1.1.20</version>
         </dependency>
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/ScoreParam.java

@@ -17,7 +17,7 @@ public class ScoreParam {
     private String city;
     private String province;
     private Integer newExpGroup;
-    private String logTraceId;
+    private String pqtId;
     private Map<String,Object> extraParam=new HashMap<>();
 
 

ad-engine-server/src/main/resources/application.yml

@@ -91,6 +91,7 @@ aliyun:
       request: request-log
       info: info-log
       error: error-log
+      statistics: statistics-log
       landingTypeFilter: landingpagetype-filter-error-log
       adPackageData: ad-package-data
     topic:

ad-engine-server/src/main/resources/logback-spring.xml

@@ -27,9 +27,9 @@
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([%X{logTraceId}]){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([%X{pqtId}]){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <!--<property name="CONSOLE_LOG_PATTERN"-->
-    <!--          value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([%X{√logTraceId}]){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(at %class.%method){cyan} \\(%file:%line\\) %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
+    <!--          value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr([%X{√pqtId}]){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(at %class.%method){cyan} \\(%file:%line\\) %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
 
 
     <!--输出到控制台-->
@@ -55,7 +55,7 @@
         <file>${LOG_PATH}/debug.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{pqtId}] %logger{50} [%L] - %msg%n</pattern>
             <charset>UTF-8</charset> <!-- 设置字符集 -->
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -85,7 +85,7 @@
         <file>${LOG_PATH}/info.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{pqtId}] %logger{50} [%L] - %msg%n</pattern>
             <charset>UTF-8</charset>
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -116,7 +116,7 @@
         <file>${LOG_PATH}/warn.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{pqtId}] %logger{50} [%L] - %msg%n</pattern>
             <charset>UTF-8</charset> <!-- 此处设置字符集 -->
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -146,7 +146,7 @@
         <file>${LOG_PATH}/error.log</file>
         <!--日志文件输出格式-->
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{pqtId}] %logger{50} [%L] - %msg%n</pattern>
             <charset>UTF-8</charset> <!-- 此处设置字符集 -->
         </encoder>
         <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -188,7 +188,7 @@
         <maxRetryBackoffMs>50000</maxRetryBackoffMs>
 
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{pqtId}] %logger{50} [%L] - %msg%n</pattern>
             <charset>UTF-8</charset>
         </encoder>
 
@@ -199,7 +199,7 @@
             <level>INFO</level>
         </filter>
 
-        <mdcFields>logTraceId</mdcFields>
+        <mdcFields>pqtId</mdcFields>
     </appender>
 
     <appender name="ALIYUN_LOG_ERROR" class="com.aliyun.openservices.log.logback.LoghubAppender">
@@ -220,7 +220,7 @@
         <maxRetryBackoffMs>50000</maxRetryBackoffMs>
 
         <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{logTraceId}] %logger{50} [%L] - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{pqtId}] %logger{50} [%L] - %msg%n</pattern>
             <charset>UTF-8</charset>
         </encoder>
 
@@ -231,7 +231,7 @@
             <level>ERROR</level>
         </filter>
 
-        <mdcFields>logTraceId</mdcFields>
+        <mdcFields>pqtId</mdcFields>
     </appender>
 
     <!--

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/log/LogHubService.java

@@ -0,0 +1,13 @@
+package com.tzld.piaoquan.ad.engine.service.log;
+
+import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
+import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
+import com.tzld.piaoquan.ad.engine.service.score.param.RecommendRequestParam;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
+
+import java.util.List;
+
+public interface LogHubService {
+
+    void scoreLogUpload(ScoreParam param, List<AdPlatformCreativeDTO> adIdList, List<AdRankItem> rankItems, RecommendRequestParam requestParam, String scoreStrategy);
+}

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/log/impl/LogHubServiceImpl.java

@@ -0,0 +1,72 @@
+package com.tzld.piaoquan.ad.engine.service.log.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.tzld.commons.aliyun.log.AliyunLogManager;
+import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
+import com.tzld.piaoquan.ad.engine.service.log.LogHubService;
+import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
+import com.tzld.piaoquan.ad.engine.service.score.param.RecommendRequestParam;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class LogHubServiceImpl implements LogHubService {
+
+    private static final ThreadPoolExecutor logUploadThreadPool = new ThreadPoolExecutor(20, 40, 30,
+            TimeUnit.MINUTES, new LinkedBlockingDeque<>(), new ThreadPoolExecutor.CallerRunsPolicy());
+
+    @Value("${aliyun.log.logstore.statistics}")
+    private String logStore;
+    @Value("${aliyun.log.project}")
+    private String project;
+
+    @Autowired
+    private AliyunLogManager aliyunLogManager;
+
+    @Override
+    public void scoreLogUpload(ScoreParam param, List<AdPlatformCreativeDTO> adIdList, List<AdRankItem> rankItems, RecommendRequestParam requestParam, String scoreStrategy) {
+        logUploadThreadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                JSONObject logMap = new JSONObject();
+                logMap.put("pqtId", param.getPqtId());
+                logMap.put("mid", param.getMid());
+                logMap.put("videoId", param.getVideoId());
+                // 获取AB实验列表
+                Set<String> abExpCode = new HashSet<>();
+                if (CollectionUtils.isNotEmpty(requestParam.getAdAbExpArr())) {
+                    for (Map map : requestParam.getAdAbExpArr()) {
+                        if (map.containsKey("abExpCode")) {
+                            abExpCode.add(map.get("abExpCode").toString());
+                        }
+                    }
+                }
+
+                logMap.put("scoreResult", JSON.toJSONString(rankItems));
+                logMap.put("creativeList", JSON.toJSONString(adIdList));
+
+                logMap.put("abExpCode", abExpCode);
+                logMap.put("adAbGroup", requestParam.getAdAbGroup());
+                logMap.put("scoreStrategy", scoreStrategy);
+                logMap.put("appType", requestParam.getAppType());
+                aliyunLogManager.sendLog(project, logStore, "", logMap);
+            }
+        });
+    }
+}

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

@@ -19,7 +19,6 @@ import com.tzld.piaoquan.ad.engine.service.predict.param.RoiThresholdPredictMode
 import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
 import com.tzld.piaoquan.ad.engine.service.predict.param.request.RoiPredictModelRequestParam;
 import com.tzld.piaoquan.ad.engine.service.predict.param.request.ThresholdPredictModelRequestParam;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -70,7 +69,7 @@ public class PredictModelServiceImpl implements PredictModelService {
 
     public Map<String, Object> adPredict(ThresholdPredictModelRequestParam requestParam) {
         Map<String,Object> result=new HashMap<>();
-        result.put("logTraceId", requestParam.getLogTraceId());
+        result.put("pqtId", requestParam.getPqtId());
         try {
             String[] withoutAdVideoIdsArr=withoutAdVideoIds.split(",");
             for(String videoId:withoutAdVideoIdsArr){
@@ -256,8 +255,8 @@ public class PredictModelServiceImpl implements PredictModelService {
 
             return result;
         }catch (Exception e){
-            log.error("svc=adPredict appType={} group={} newGroup={} logTraceId={}"
-                    ,requestParam.getAppType(),requestParam.getAbTestCode(),requestParam.getNewExpGroup(),requestParam.getLogTraceId());
+            log.error("svc=adPredict appType={} group={} newGroup={} pqtId={}"
+                    ,requestParam.getAppType(),requestParam.getAbTestCode(),requestParam.getNewExpGroup(),requestParam.getPqtId());
             result.put("ad_predict", 1);
             result.put("no_ad_strategy", "error");
             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;
+    String pqtId;
     MachineInfoParam machineInfo = new MachineInfoParam();
 }

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

@@ -43,7 +43,7 @@ public class VideoAdThompsonScorerV2 {
     public List<AdRankItem> thompsonScorerByExp663(ScoreParam param, List<AdPlatformCreativeDTO> adIdList){
         List<AdRankItem> result=new LinkedList<>();
         String jsonStr;
-        CreativeStatistic statistic;
+        CreativeStatistic statistic = null;
         List<String> redisKey=new LinkedList<>();
         adIdList.forEach(creativeDTO -> {
             redisKey.add(redisCreativeStatisticsPrefix+creativeDTO.getCreativeId());
@@ -67,7 +67,12 @@ public class VideoAdThompsonScorerV2 {
                     score = (exp663Param.getOrDefault("alpha",1d)+Long.parseLong(statistic.getOrder()))
                             / (exp663Param.getOrDefault("beta",10000d)+Long.parseLong(statistic.getExp())) ;
                 }
+                double s1 = score;
                 score=score*dto.getCpa()*dto.getBid1()*dto.getBid2();
+
+                Map<String, Object> ext = this.extMap(statistic, "663", dto.getCpa(), null, exp663Param.getOrDefault("alpha", 1d), exp663Param.getOrDefault("beta", 10000d), null);
+                ext.put("s1", s1);
+                item.setExt(ext);
                 item.setScore(score);
                 item.setScore_type(663);
             }catch (Exception e){
@@ -82,7 +87,7 @@ public class VideoAdThompsonScorerV2 {
     public List<AdRankItem> thompsonScorerByExp664(ScoreParam param,List<AdPlatformCreativeDTO> adIdList){
         List<AdRankItem> result=new LinkedList<>();
         String jsonStr;
-        CreativeStatistic statistic;
+        CreativeStatistic statistic=null;
         List<String> redisKey=new LinkedList<>();
         adIdList.forEach(creativeDTO -> {
             redisKey.add(redisVideoCreativeStatisticsPrefix+param.getVideoId()+"_"+creativeDTO.getCreativeId());
@@ -107,8 +112,13 @@ public class VideoAdThompsonScorerV2 {
                     score = (exp664Param.getOrDefault("alpha",1d)+Long.parseLong(statistic.getOrder()))
                             / (exp664Param.getOrDefault("beta",10000d)+Long.parseLong(statistic.getExp())) ;
                 }
+                double s1 = score;
                 score=score*dto.getCpa()*dto.getBid1()*dto.getBid2();
                 item.setScore(score);
+
+                Map<String, Object> ext = this.extMap(statistic, "664", dto.getCpa(), null, exp663Param.getOrDefault("alpha", 1d), exp663Param.getOrDefault("beta", 10000d), null);
+                ext.put("s1", s1);
+                item.setExt(ext);
                 item.setScore_type(664);
             }catch (Exception e){
                 log.error("svc=thompsonScorerByExp664 {}",gson.toJson(e.getStackTrace()));
@@ -123,7 +133,7 @@ public class VideoAdThompsonScorerV2 {
     public List<AdRankItem> thompsonScorerByExp665(ScoreParam param,List<AdPlatformCreativeDTO> adIdList){
         List<AdRankItem> result=new LinkedList<>();
         String jsonStr;
-        CreativeStatistic statistic;
+        CreativeStatistic statistic = null;
         List<String> redisKey=new LinkedList<>();
         adIdList.forEach(creativeDTO -> {
             redisKey.add(redisCreativeStatisticsPrefix+creativeDTO.getCreativeId());
@@ -146,9 +156,14 @@ public class VideoAdThompsonScorerV2 {
                     score = betaSampler(exp665Param.getOrDefault("alpha",1d)+Long.parseLong(statistic.getOrder()) ,
                             (exp665Param.getOrDefault("beta",100000d)+Long.parseLong(statistic.getExp())))/ (1+exp665Param.getOrDefault("beta_k",9d));
                 }
+                double s1 = score;
                 score=score*dto.getCpa()*dto.getBid1()*dto.getBid2();
                 item.setScore(score);
                 item.setScore_type(665);
+
+                Map<String, Object> ext = this.extMap(statistic, "665", dto.getCpa(), null, exp663Param.getOrDefault("alpha", 1d), exp663Param.getOrDefault("beta", 10000d), null);
+                ext.put("s1", s1);
+                item.setExt(ext);
             }catch (Exception e){
                 log.error("svc=thompsonScorerByExp665 {}",gson.toJson(e.getStackTrace()));
             }
@@ -162,7 +177,7 @@ public class VideoAdThompsonScorerV2 {
     public List<AdRankItem> thompsonScorerByExp666(ScoreParam param,List<AdPlatformCreativeDTO> adIdList){
         List<AdRankItem> result=new LinkedList<>();
         String jsonStr;
-        CreativeStatistic statistic;
+        CreativeStatistic statistic = null;
 
         List<String> redisKey=new LinkedList<>();
         adIdList.forEach(creativeDTO -> {
@@ -195,7 +210,7 @@ public class VideoAdThompsonScorerV2 {
                 }else {
                     statistic =gson.fromJson(jsonStr,CreativeStatistic.class);
                     if(Double.parseDouble(statistic.getExp())>exp666Param.getOrDefault("viewThreshold",5000d)){
-                        score = betaSampler(1d+Long.parseLong(statistic.getOrder()) ,
+                        score = betaSampler(exp666Param.getOrDefault("alpha",1d)+Long.parseLong(statistic.getOrder()) ,
                                 (exp666Param.getOrDefault("beta",100000d)+Long.parseLong(statistic.getExp()))/(1+exp666Param.getOrDefault("beta_k",9d))) ;
                     } else if( values.get(i)!=null) {
                         statistic =gson.fromJson(values.get(i),CreativeStatistic.class);
@@ -205,9 +220,16 @@ public class VideoAdThompsonScorerV2 {
                         score = betaSampler(exp666Param.getOrDefault("alpha",1d),exp666Param.getOrDefault("beta",100000d));
                     }
                 }
+                double s1 = score;
                 score=score*dto.getCpa()*dto.getBid1()*dto.getBid2();
                 item.setScore(score);
                 item.setScore_type(666);
+
+                Map<String, Object> ext = this.extMap(statistic, "666", dto.getCpa(), exp666Param.getOrDefault("viewThreshold",5000d), exp663Param.getOrDefault("alpha", 1d),
+                        exp663Param.getOrDefault("beta", 10000d), exp666Param.getOrDefault("beta_k",9d));
+                ext.put("s1", s1);
+                item.setExt(ext);
+
             }catch (Exception e){
                 log.error("svc=thompsonScorerByExp666 {}",gson.toJson(e.getStackTrace()));
             }
@@ -333,6 +355,25 @@ public class VideoAdThompsonScorerV2 {
         };
     }
 
+
+    private Map<String, Object> extMap(CreativeStatistic statistic, String abCode, Double cpa, Double viewThreshold, Double alpha, Double beta, Double beta_k) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("abCode", abCode);
+        if (Objects.nonNull(viewThreshold)) {
+            map.put("viewThreshold", viewThreshold);
+        }
+        map.put("alpha", alpha);
+        map.put("beta", beta);
+        map.put("beta_k", beta_k);
+        map.put("cpa", cpa);
+        if (Objects.nonNull(statistic)) {
+            map.put("click", statistic.click);
+            map.put("order", statistic.getOrder());
+            map.put("exp", statistic.getExp());
+        }
+        return map;
+    }
+
     class CreativeStatistic{
 
         private String exp;

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

@@ -25,12 +25,8 @@ public class RequestConvert {
         scoreParam.setRequestContext(context);
         scoreParam.setVideoId(request.getVideoId());
         scoreParam.setNewExpGroup(request.getNewExpGroup());
-<<<<<<< Updated upstream
-        scoreParam.setLogTraceId(request.getLogTraceId());
-=======
         scoreParam.setPqtId(request.getPqtId());
         scoreParam.setMid(request.getMid());
->>>>>>> Stashed changes
         return scoreParam;
     }
 

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

@@ -3,6 +3,7 @@ package com.tzld.piaoquan.ad.engine.service.score.impl;
 import com.alibaba.fastjson.JSONObject;
 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.log.LogHubService;
 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;
@@ -44,6 +45,8 @@ public class RankServiceImpl implements RankService {
     RankServiceThompsonImpl rankServiceThompson;
     @Autowired
     VideoAdThompsonScorerV2 videoAdThompsonScorerV2;
+    @Autowired
+    private LogHubService logHubService;
 
     @Autowired
     AdCreativeFeatureContainer adCreativeFeatureContainer;
@@ -161,7 +164,7 @@ public class RankServiceImpl implements RankService {
             object.put("dataTime",currentTime.format(timeFormatter));
             object.put("creativeId",rankResult.get(0).getAdId());
             object.put("videoId", request.getVideoId());
-            object.put("logTraceId", request.getLogTraceId());
+            object.put("pqtId", request.getPqtId());
             log.info("svc=adItemRank {}", JSONObject.toJSONString(object));
             object.remove("lrsamples");
             if(inCpcPidExp){
@@ -268,7 +271,8 @@ public class RankServiceImpl implements RankService {
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp670(param, request.getAdIdList());
         }
 
-
+        // 日志上报
+        logHubService.scoreLogUpload(param, request.getAdIdList(), rankResult, request, "video_ad_thompson");
 
         if (!CollectionUtils.isEmpty(rankResult)) {
             JSONObject object=new JSONObject();
@@ -283,7 +287,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());
+            object.put("pqtId", request.getPqtId());
             log.info("svc=videoAdThompsonRank_lr_log {}", JSONObject.toJSONString(object));
             object.remove("lrsamples");
             object.put("score_500",rankResult.get(0).getTf_ctr());
@@ -416,7 +420,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());
+        object.put("pqtId", request.getPqtId());
         log.info("svc=adBidRank {}", JSONObject.toJSONString(object));
         object.remove("lrsamples");
         log.info("svc=pid_log obj={}", JSONObject.toJSONString(object));
@@ -539,7 +543,7 @@ public class RankServiceImpl implements RankService {
         //CPA还原
         object.put("cpa",dto.getCpa()*dto.getBid1());
         object.put("oCpa",dto.getCpa());
-        object.put("logTraceId", request.getLogTraceId());
+        object.put("pqtId", request.getPqtId());
         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,7 @@ public class RecommendRequestParam {
     //市-中文
     String city = "-1";
     Integer newExpGroup;
-    String logTraceId;
+    String pqtId;
     List<Map> adAbExpArr ;
+    String adAbGroup;
 }