Merge branch 'ocpm_bid_engine_scores' into test

ad-engine-service/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.tzld.piaoquan</groupId>
             <artifactId>recommend-feature-client</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.6</version>
         </dependency>
 
     </dependencies>

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

@@ -26,7 +26,7 @@ public class VlogAdCtrLRScorer extends BaseLRModelScorer {
 
     private final static int CORE_POOL_SIZE = 64;
 
-    private static final int LOCAL_TIME_OUT = 150;
+    private static final int LOCAL_TIME_OUT = 150000;
     private final static Logger LOGGER = LoggerFactory.getLogger(VlogAdCtrLRScorer.class);
     private static final ExecutorService executorService = Executors.newFixedThreadPool(128);
     private static final double defaultUserCtrGroupNumber = 10.0;
@@ -120,6 +120,9 @@ public class VlogAdCtrLRScorer extends BaseLRModelScorer {
                         item.getAdId(), ExceptionUtils.getFullStackTrace(e)});
             }
         }
+        lrSamples.toBuilder().setPredictCtr(pro);
+        //
+//        System.out.println("svc=lrSamplePrint  lrSamples="+lrSamples.toString());
         item.setCtr(pro);
         return pro;
     }

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/convert/FeatureConvert.java

@@ -48,11 +48,11 @@ public class FeatureConvert {
 
     public static AdActionFeature convertToJava(AdActionFeatureProto adActionFeatureProto) {
         AdActionFeature adActionFeature = new AdActionFeature();
-        adActionFeature.setAdView(adActionFeatureProto.getAdView());
-        adActionFeature.setAdClick(adActionFeatureProto.getAdClick());
-        adActionFeature.setAdConversion(adActionFeatureProto.getAdConversion());
-        adActionFeature.setCtr(adActionFeatureProto.getCtr());
-        adActionFeature.setCvr(adActionFeatureProto.getCvr());
+        adActionFeature.setOriginAdView(adActionFeatureProto.getAdView());
+        adActionFeature.setOriginAdClick(adActionFeatureProto.getAdClick());
+        adActionFeature.setOriginAdConversion(adActionFeatureProto.getAdConversion());
+        adActionFeature.setOriginCtr(adActionFeatureProto.getCtr());
+        adActionFeature.setOriginCvr(adActionFeatureProto.getCvr());
         return adActionFeature;
     }
 

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

@@ -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,6 +43,12 @@ public class RankServiceImpl implements RankService {
     public AdRankItem adItemRank(RankRecommendRequestParam request){
 
         ScoreParam param= RequestConvert.requestConvert(request);
+        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();
@@ -90,6 +101,8 @@ public class RankServiceImpl implements RankService {
                 e.printStackTrace();
             }
         }
+        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){
             rankItems=new LinkedList<>();