adresult_scores_to_logs

ad-engine-server/src/main/java/com/tzld/piaoquan/ad/engine/server/controller/AdRecommendController.java

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.ad.engine.server.controller;
 
 import com.tzld.piaoquan.ad.engine.service.score.RankService;
 import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,12 +23,13 @@ public class AdRecommendController {
 
     @RequestMapping("/top1/basic")
     public Map<String,Object> adRecommendTop1Basic(@RequestBody RankRecommendRequestParam request){
-        Long adId= rankService.adItemRank(request);
+        AdRankItem rankResult = rankService.adItemRank(request);
         HashMap map =new HashMap();
         map.put("code","0");
         map.put("msg","success");
         HashMap contentMap=new HashMap<>();
-        contentMap.put("adId",adId);
+        contentMap.put("adId", rankResult.getAdId());
+        contentMap.put("adScore", rankResult.getScore());
         map.put("content",contentMap);
         return map;
     }

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/param/RuleParamHelper.java

@@ -204,7 +204,9 @@ public class RuleParamHelper {
             }
         }
 
-        String thresholdKeyName = thresholdKeyNamePrefix + abtestId + ":" + abtestConfigTag + ":" + abTestCode + ":" + midGroup;
+       //  String thresholdKeyName = thresholdKeyNamePrefix + abtestId + ":" + abtestConfigTag + ":" + abTestCode + ":" + midGroup;
+        String thresholdKeyName = thresholdKeyNamePrefix + "ad-engine" + ":" + abtestConfigTag + ":" + abTestCode + ":" + midGroup;
+
         String thresholdStr = redisHelper.get(thresholdKeyName);
         double threshold = (thresholdStr != null) ? Double.parseDouble(thresholdStr) : 0.0;
 

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

@@ -1,8 +1,11 @@
 package com.tzld.piaoquan.ad.engine.service.score;
 
 import com.tzld.piaoquan.ad.engine.service.score.param.RankRecommendRequestParam;
+import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
+
+import java.util.Map;
 
 public interface RankService {
 
-    Long adItemRank( RankRecommendRequestParam request);
+    AdRankItem adItemRank(RankRecommendRequestParam request);
 }

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

@@ -10,6 +10,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 javafx.util.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +27,7 @@ public class RankServiceImpl implements RankService {
     @Autowired
     FeatureRemoteService featureRemoteService;
 
-    public Long adItemRank( RankRecommendRequestParam request){
+    public AdRankItem adItemRank(RankRecommendRequestParam request){
 
         ScoreParam param= RequestConvert.requestConvert(request);
         UserAdFeature userAdFeature=featureRemoteService.getUserAdFeature(request.getMid());
@@ -51,8 +52,10 @@ public class RankServiceImpl implements RankService {
                 .getScorerPipeline(
                         ScorerUtils.BASE_CONF)
                 .scoring(param, userAdFeature, rankItems);
+
+
         if (!CollectionUtils.isEmpty(rankResult)) {
-           return rankResult.get(0).getAdId();
+           return rankResult.get(0);
         }else {
             return null;
         }