Merge branch 'dev_v1.0' into test

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/base/AdItemFeature.java

@@ -45,13 +45,13 @@ public class AdItemFeature {
 
 
     // 当天统计量信息
-    private AdActionFeature day1_cnt_features;
+    private AdActionFeature day1_cnt_features=new AdActionFeature();
     // 3天内统计量
-    private AdActionFeature day3_cnt_features;
+    private AdActionFeature day3_cnt_features=new AdActionFeature();
     // 7天内统计量
-    private AdActionFeature day7_cnt_features;
+    private AdActionFeature day7_cnt_features=new AdActionFeature();
     // 3个月统计量
-    private AdActionFeature month3_cnt_features;
+    private AdActionFeature month3_cnt_features=new AdActionFeature();
 
 
 

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

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.ad.engine.service.score.impl;
 
+import com.tzld.piaoquan.ad.engine.commons.base.AdItemFeature;
 import com.tzld.piaoquan.ad.engine.commons.base.AdRankItem;
 import com.tzld.piaoquan.ad.engine.commons.base.UserAdFeature;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
@@ -12,7 +13,6 @@ import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -37,6 +37,16 @@ public class RankServiceImpl implements RankService {
                 getAllAdFeatureList(
                         CommonCollectionUtils.toList(request.getAdIdList(),id->id.toString())
                 );
+        //兜底方案
+        if(rankItems==null|| rankItems.size()==0){
+            AdItemFeature feature=new AdItemFeature();
+            feature.setAdId(request.getAdIdList().get(0).toString());
+            AdRankItem adRankItem=new AdRankItem();
+            adRankItem.setAdId(request.getAdIdList().get(0));
+            adRankItem.setItemFeature(feature);
+            rankItems=new ArrayList<>();
+            rankItems.add(adRankItem);
+        }
         List<AdRankItem> rankResult = ScorerUtils
                 .getScorerPipeline(
                         ScorerUtils.BASE_CONF)