|
@@ -2,6 +2,7 @@ package com.tzld.piaoquan.ad.engine.service.score.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.google.gson.JsonObject;
|
|
|
+import com.tzld.piaoquan.ad.engine.commons.util.DateUtils;
|
|
|
import com.tzld.piaoquan.ad.engine.service.score.dto.AdPlatformBidCreativeDTO;
|
|
|
import com.tzld.piaoquan.ad.engine.service.score.param.BidRankRecommendRequestParam;
|
|
|
import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdItemFeature;
|
|
@@ -14,6 +15,7 @@ import com.tzld.piaoquan.ad.engine.service.score.FeatureRemoteService;
|
|
|
import com.tzld.piaoquan.ad.engine.service.score.RankService;
|
|
|
import com.tzld.piaoquan.ad.engine.service.score.convert.RequestConvert;
|
|
|
import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam;
|
|
|
+import org.joda.time.LocalTime;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -21,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
+import java.time.DayOfWeek;
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -38,8 +43,12 @@ public class RankServiceImpl implements RankService {
|
|
|
public AdRankItem adItemRank(RankRecommendRequestParam request){
|
|
|
|
|
|
ScoreParam param= RequestConvert.requestConvert(request);
|
|
|
- param.getRequestContext().setHour("8");
|
|
|
- param.getRequestContext().setWeek("1");
|
|
|
+ LocalDateTime currentTime = LocalDateTime.now();
|
|
|
+ int currentHour = currentTime.getHour();
|
|
|
+ int dayOfWeek = currentTime.getDayOfWeek().getValue();
|
|
|
+ param.getRequestContext().setHour(currentHour+"");
|
|
|
+ param.getRequestContext().setWeek(dayOfWeek+"");
|
|
|
+
|
|
|
UserAdFeature userAdFeature=featureRemoteService.getUserAdFeature(request.getMid());
|
|
|
if(userAdFeature==null){
|
|
|
userAdFeature=new UserAdFeature();
|
|
@@ -48,8 +57,6 @@ public class RankServiceImpl implements RankService {
|
|
|
getAllAdFeatureList(
|
|
|
CommonCollectionUtils.toList(request.getAdIdList(),id->id.toString())
|
|
|
);
|
|
|
- log.info("svc=adItemRank param={} userAdFeature={} rankItems={}",
|
|
|
- JSONObject.toJSONString(param),JSONObject.toJSONString(userAdFeature),JSONObject.toJSONString(rankItems));
|
|
|
//兜底方案
|
|
|
List<AdRankItem> rankResult;
|
|
|
if(rankItems==null|| rankItems.size()==0){
|