Merge branch 'feature_20240513_zhaohaipeng_ad_union_thompson' into test

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

@@ -1,16 +0,0 @@
-package com.tzld.piaoquan.ad.engine.service.score.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@ToString
-@SuperBuilder
-@EqualsAndHashCode(callSuper = true)
-public class AdUnionCreativeDTO extends AdPlatformCreativeDTO {
-
-    private Long mediaId;
-
-}

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

@@ -6,7 +6,6 @@ import com.tzld.piaoquan.ad.engine.service.score.container.PidLambdaContainer;
 import com.tzld.piaoquan.ad.engine.service.score.container.PidLambdaForCpcContainer;
 import com.tzld.piaoquan.ad.engine.service.score.container.PidLambdaV2Container;
 import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformCreativeDTO;
-import com.tzld.piaoquan.ad.engine.service.score.dto.AdUnionCreativeDTO;
 import com.tzld.piaoquan.ad.engine.service.score.param.BidRankRecommendRequestParam;
 import com.tzld.piaoquan.ad.engine.service.score.param.UnionRankRecommendRequestParam;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdItemFeature;
@@ -29,7 +28,6 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 @Service

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

@@ -1,7 +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;