Merge branch 'feature_break'

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/ScoreV2ThresholdPredictModel.java

@@ -1,14 +1,18 @@
 package com.tzld.piaoquan.ad.engine.service.predict.model.threshold;
 
+import com.alibaba.fastjson.JSONObject;
 import com.tzld.piaoquan.ad.engine.commons.score.AdConfig;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.commons.score.ScorerUtils;
 import com.tzld.piaoquan.ad.engine.commons.util.CommonCollectionUtils;
+import com.tzld.piaoquan.ad.engine.service.predict.impl.PredictModelServiceImpl;
 import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
 import com.tzld.piaoquan.ad.engine.service.remote.FeatureRemoteService;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRequestContext;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.UserAdFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -23,7 +27,7 @@ import static com.tzld.piaoquan.ad.engine.commons.score.ScorerUtils.BREAK_CONFIG
 
 @Component
 public class ScoreV2ThresholdPredictModel extends ThresholdPredictModel {
-
+    private final static Logger log = LoggerFactory.getLogger(ScoreV2ThresholdPredictModel.class);
     @Autowired
     private FeatureRemoteService featureRemoteService;
 
@@ -91,10 +95,13 @@ public class ScoreV2ThresholdPredictModel extends ThresholdPredictModel {
             // Otherwise, show the ad
             adPredict = 2;
         }
+
         Map<String, Object> result = new HashMap<>();
         result.put("threshold", threshold);
         result.put("score", maxItem == null ? -1 : maxItem.getScore());
         result.put("ad_predict", adPredict);
+        log.info("svc=predict modelName=modelV2 result={}", JSONObject.toJSONString(result));
+
         return result;
     }
 }