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

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/dto/AdPlatformCreativeDTO.java

@@ -4,6 +4,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.ToString;
 
+import java.util.List;
+
 @Builder
 @Data
 @ToString
@@ -41,4 +43,6 @@ public class AdPlatformCreativeDTO {
      */
     private AdDirectionScore adDirectionScore;
 
+    // 召回源，记录召回用
+    private List<String> recallSources;
 }

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

@@ -111,6 +111,7 @@ public class RankStrategyBy679 extends RankStrategyBasic {
                     } else {
                         adRankItem.getExt().put("isApi", "1");
                     }
+                    adRankItem.getExt().put("recallsources", dto.getRecallSources());
 
                     String cidStr = dto.getCreativeId().toString();
                     Map<String, String> cidFeatureMap = adRankItem.getFeatureMap();

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

@@ -108,6 +108,8 @@ public class RankStrategyBy680 extends RankStrategyBasic {
                         adRankItem.getExt().put("isApi", "1");
                     }
 
+                    adRankItem.getExt().put("recallsources", dto.getRecallSources());
+
                     String cidStr = dto.getCreativeId().toString();
                     Map<String, String> cidFeatureMap = adRankItem.getFeatureMap();
                     Map<String, Map<String, String>> cidFeature = allCidFeature.getOrDefault(cidStr, new HashMap<>());
@@ -223,7 +225,7 @@ public class RankStrategyBy680 extends RankStrategyBasic {
 
         result.sort(ComparatorUtil.equalsRandomComparator());
 
-        if (CollectionUtils.isNotEmpty(result)){
+        if (CollectionUtils.isNotEmpty(result)) {
             AdRankItem top1Item = result.get(0);
             for (Map.Entry<String, Map<String, String>> entry : videoFeature.entrySet()) {
                 if (MapUtils.isNotEmpty(entry.getValue())) {

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

@@ -89,6 +89,7 @@ public class RankStrategyBy683 extends RankStrategyBasic {
                     } else {
                         adRankItem.getExt().put("isApi", "1");
                     }
+                    adRankItem.getExt().put("recallsources", dto.getRecallSources());
 
                     String cidStr = dto.getCreativeId().toString();
                     Map<String, String> cidFeatureMap = adRankItem.getFeatureMap();

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

@@ -93,6 +93,7 @@ public class RankStrategyBy687 extends RankStrategyBasic {
                 } else {
                     adRankItem.getExt().put("isApi", "1");
                 }
+                adRankItem.getExt().put("recallsources", dto.getRecallSources());
 
 
                 String cidStr = dto.getCreativeId().toString();

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

@@ -100,6 +100,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
                     } else {
                         adRankItem.getExt().put("isApi", "1");
                     }
+                    adRankItem.getExt().put("recallsources", dto.getRecallSources());
 
                     String cidStr = dto.getCreativeId().toString();
                     Map<String, String> cidFeatureMap = adRankItem.getFeatureMap();

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

@@ -49,6 +49,7 @@ public class RankStrategyByWeight extends RankStrategyBasic {
             } else {
                 adRankItem.getExt().put("isApi", "1");
             }
+            adRankItem.getExt().put("recallsources", dto.getRecallSources());
 
 
             adRankItems.add(adRankItem);