|
@@ -55,7 +55,7 @@ public class RankServiceImpl implements RankService {
|
|
|
}
|
|
|
log.info("svc=adItemRank rankResult={}", JSONObject.toJSONString(rankResult));
|
|
|
if (!CollectionUtils.isEmpty(rankResult)) {
|
|
|
- return rankResult.get(0);
|
|
|
+ return rankResult.get(0);
|
|
|
}else {
|
|
|
//空返回值
|
|
|
return new AdRankItem();
|
|
@@ -71,14 +71,15 @@ public class RankServiceImpl implements RankService {
|
|
|
userAdFeature=new UserAdFeature();
|
|
|
}
|
|
|
Map<String,List<AdPlatformBidCreativeDTO>> groupMap=request
|
|
|
- .getCreativeList()
|
|
|
- .stream()
|
|
|
+ .getCreativeList()
|
|
|
+ .stream()
|
|
|
. collect(Collectors.groupingBy(creativeDTO -> creativeDTO.getCreativeId()+""));
|
|
|
|
|
|
List<AdRankItem> rankItems=featureRemoteService.
|
|
|
getAllAdFeatureList(
|
|
|
new ArrayList<>(groupMap.keySet())
|
|
|
);
|
|
|
+
|
|
|
for(AdRankItem item:rankItems){
|
|
|
try {
|
|
|
AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()+"").get(0);
|
|
@@ -91,6 +92,16 @@ public class RankServiceImpl implements RankService {
|
|
|
}
|
|
|
List<AdRankItem> rankResult;
|
|
|
if(rankItems==null|| rankItems.size()==0){
|
|
|
+ rankItems=new LinkedList<>();
|
|
|
+ for(AdPlatformBidCreativeDTO dto:request.getCreativeList()){
|
|
|
+ AdRankItem item=new AdRankItem();
|
|
|
+ item.setBid1(dto.getBid1());
|
|
|
+ item.setBid2(dto.getBid2());
|
|
|
+ item.setCpa(dto.getCpa());
|
|
|
+ item.setAdId(dto.getCreativeId());
|
|
|
+ item.setItemFeature(new AdItemFeature());
|
|
|
+ rankItems.add(item);
|
|
|
+ }
|
|
|
rankResult=rankServiceThompson.rank(param, userAdFeature, rankItems,null);
|
|
|
}else {
|
|
|
rankResult=rank(param, userAdFeature, rankItems,ScorerUtils.BASE_CONF);
|