feat:添加日志

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

@@ -18,8 +18,6 @@ import java.util.*;
 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
@@ -61,6 +59,7 @@ public class LogHubServiceImpl implements LogHubService {
                 for (AdRankItem rankItem : rankItems) {
                     JSONObject json = new JSONObject();
                     json.put("adId", rankItem.getAdId());
+                    json.put("cid", rankItem.getAdId());
                     json.put("score", rankItem.getScore());
                     json.put("ext", rankItem.getExt());
                     json.put("weight", rankItem.getWeight());
@@ -70,6 +69,7 @@ public class LogHubServiceImpl implements LogHubService {
 
                 AdRankItem top1 = rankItems.get(0);
                 logMap.put("top1_adId", top1.getAdId());
+                logMap.put("top1_cid", top1.getAdId());
                 logMap.put("top1_score", top1.getScore());
                 logMap.put("top1_ext", JSON.toJSONString(top1.getExt()));
                 logMap.put("top1_weight", top1.getWeight());
@@ -78,6 +78,13 @@ public class LogHubServiceImpl implements LogHubService {
                 logMap.put("adAbGroup", requestParam.getAdAbGroup());
                 logMap.put("scoreStrategy", scoreStrategy);
                 logMap.put("appType", requestParam.getAppType());
+
+                if (Objects.nonNull(requestParam.getStatisticsLog())) {
+                    logMap.put("earlyAdIds", requestParam.getStatisticsLog().getEarlyAdIds());
+                    logMap.put("earlyCidList", requestParam.getStatisticsLog().getEarlyCreativeIds());
+                    logMap.put("finalCidList", requestParam.getStatisticsLog().getFinalCreativeIds());
+                }
+
                 aliyunLogManager.sendLog(project, logStore, "", logMap);
             }
         });

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

@@ -38,6 +38,7 @@ public class VideoAdThompsonScorerV2 {
     private Map<String, Double> exp666Param = new HashMap<>();
     private Map<String, Double> exp669Param = new HashMap<>();
     private Map<String, Double> exp670Param = new HashMap<>();
+    private Map<String, Double> exp672Param = new HashMap<>();
 
     Random random = new Random();
     Gson gson = new Gson();
@@ -434,11 +435,19 @@ public class VideoAdThompsonScorerV2 {
             CreativeStatistic cidStatistic = cidMap.getOrDefault(dto.getCreativeId(), new CreativeStatistic());
             CreativeStatistic vidCidStatistic = vidCidMap.getOrDefault(dto.getCreativeId(), new CreativeStatistic());
 
+            double cidExp = cidStatistic.parseExpToDouble();
+            double vidCidExp = vidCidStatistic.parseExpToDouble();
+
             double cidScore = this.calcThompsonScore(expParam, cidStatistic, alpha, cidBeta);
             double vidCidScore = this.calcThompsonScore(expParam, vidCidStatistic, alpha, vidCidBeta);
+
             double w1 = expParam.getOrDefault("w1", 1d);
             double w2 = expParam.getOrDefault("w2", 1d);
-            double score = ((w1 * vidCidScore + w2 * cidScore) / (w1 + w2)) * dto.getCpa();
+
+            double score = 0;
+            if (w1 != 0 || w2 != 0) {
+                score = ((w1 * vidCidScore * vidCidExp + w2 * cidScore * cidExp) / (w1 + w2)) * dto.getCpa();
+            }
 
 
             // 日志上报扩展参数
@@ -451,6 +460,8 @@ public class VideoAdThompsonScorerV2 {
             ext.put("vidCidA", alpha);
             ext.put("cidB", cidBeta);
             ext.put("vidCidB", vidCidBeta);
+            ext.put("cidExp", cidExp);
+            ext.put("vidCidExp", vidCidExp);
             ext.put("bid1", dto.getBid1());
             ext.put("bid2", dto.getBid2());
             ext.put("cidStatistic", JSON.toJSONString(cidStatistic));
@@ -545,6 +556,13 @@ public class VideoAdThompsonScorerV2 {
         return map;
     }
 
+    public List<AdRankItem> thompsonScorerByExp672(ScoreParam param, List<AdPlatformCreativeDTO> adIdList) {
+
+
+
+        return null;
+    }
+
     class CreativeStatistic {
 
         private String exp;
@@ -665,4 +683,9 @@ public class VideoAdThompsonScorerV2 {
     public void setExp670Param(String str) {
         this.exp670Param = gson.fromJson(str, Map.class);
     }
+
+    @Value("${ad.engine.new.thompson.exp.V2.672{}}")
+    public void setExp672Param(String str) {
+        this.exp672Param = gson.fromJson(str, Map.class);
+    }
 }

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

@@ -285,6 +285,11 @@ public class RankServiceImpl implements RankService {
                         request.getAppType().toString(), request.getNewExpGroup(), "670", modelParam))) {
             rankResult = videoAdThompsonScorerV2.thompsonScorerByExp670(param, request.getAdIdList());
             abCode = "670";
+        }else if (expCodes.contains("672") ||
+                (expCodes.contains(NewExpInfoHelper.flagId) && NewExpInfoHelper.checkInNewExpGroupAndSetParamIfIn(
+                        request.getAppType().toString(), request.getNewExpGroup(), "670", modelParam))){
+            rankResult = videoAdThompsonScorerV2.thompsonScorerByExp672(param, request.getAdIdList());
+            abCode = "672";
         }
 
         // 日志上报

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

@@ -22,4 +22,6 @@ public class RecommendRequestParam {
     String pqtId;
     List<Map> adAbExpArr ;
     String adAbGroup;
+
+    private StatisticsLogParam statisticsLog;
 }

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

@@ -0,0 +1,19 @@
+package com.tzld.piaoquan.ad.engine.service.score.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 广告分发过程中的统计日志，ad-engine.statistics-log库用
+ */
+@Data
+public class StatisticsLogParam {
+
+    private List<Long> earlyAdIds;
+
+    private List<Long> earlyCreativeIds;
+
+    private List<Long> finalCreativeIds;
+
+}