Merge branch 'feature_20240513_zhaohaipeng_ad_union_thompson' into test

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

@@ -503,17 +503,18 @@ public class RankServiceImpl implements RankService {
             item.setBid2(dto.getBid2());
             item.setAdId(dto.getCreativeId());
             item.setItemFeature(new AdItemFeature());
+            item.setMediaId(request.getMediaId());
             rankItems.add(item);
         }
         rankResult = rank(param, null, rankItems, ScorerUtils.UNION_THOMPSON_CONF);
 
         AdRankItem topItem=rankResult.get(0);
 
-        Optional<AdUnionCreativeDTO> first = request.getCreativeList().stream()
+        Optional<AdPlatformCreativeDTO> first = request.getCreativeList().stream()
                 .filter(dto -> Objects.equals(dto.getCreativeId(), topItem.getAdId()))
                 .findFirst();
         if (first.isPresent()) {
-            AdUnionCreativeDTO dto = first.get();
+            AdPlatformCreativeDTO dto = first.get();
             JSONObject object = new JSONObject();
             object.put("mid", request.getMid());
             object.put("adid", dto.getCreativeId());

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

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.ad.engine.service.score.param;
 
+import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
 import com.tzld.piaoquan.ad.engine.service.score.dto.AdUnionCreativeDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,5 +10,8 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class UnionRankRecommendRequestParam extends RecommendRequestParam{
-    List<AdUnionCreativeDTO> creativeList;
+
+    private Long mediaId;
+
+    List<AdPlatformCreativeDTO> creativeList;
 }