Merge branch 'refs/heads/dev-xym-add-ecpm' into pre-master

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

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/enums/GuaranteedTypeEnum.java

@@ -0,0 +1,24 @@
+package com.tzld.piaoquan.ad.engine.commons.enums;
+
+public enum GuaranteedTypeEnum {
+
+    IS_GUARANTEED(1, "保量广告"),
+    NOT_GUARANTEED(0, "非保量广告"),
+
+    ;
+    private final Integer type;
+    private final String desc;
+
+    GuaranteedTypeEnum(Integer type, String desc) {
+        this.type = type;
+        this.desc = desc;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

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

@@ -41,8 +41,17 @@ public class AdRecommendController {
                 map.put("code", "0");
                 map.put("msg", "success");
                 Map<String, Object> contentMap = new HashMap<>();
-                contentMap.put("adId", request.getAdIdList().get(0).getCreativeId());
-                contentMap.put("adScore", 100);
+                contentMap.put("adId", rankResult.getAdId());
+                contentMap.put("adScore", rankResult.getScore());
+                Double ctcvrScore = rankResult.getScoreMap().get("ctcvrScore");
+                if (ctcvrScore != null) {
+                    contentMap.put("ecpm", ctcvrScore * rankResult.getCpa() * 1000);
+                }
+                if (rankResult.getExt().get("isGuaranteed") != null && rankResult.getExt().get("isGuaranteed").equals(true)) {
+                    contentMap.put("type", GuaranteedTypeEnum.IS_GUARANTEED.getType());
+                } else {
+                    contentMap.put("type", GuaranteedTypeEnum.NOT_GUARANTEED.getType());
+                }
                 map.put("content", contentMap);
                 return map;
             }

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

@@ -131,6 +131,7 @@ public abstract class RankStrategyBasic implements RankStrategy {
         sceneFeatureMap.put("dayofweek_" + DateUtils.getDayOrWeekByTimestamp(ts), "0.1");
         sceneFeatureMap.put("hour", String.valueOf(DateUtils.getHourByTimestamp(ts)));
         sceneFeatureMap.put("hour_quarter", String.valueOf(DateUtils.getHourQuarter(ts)));
+        sceneFeatureMap.put("ts", String.valueOf(ts));
         return sceneFeatureMap;
     }
 
@@ -203,8 +204,10 @@ public abstract class RankStrategyBasic implements RankStrategy {
             GuaranteeView guaranteeView = map.get(adVerId);
             if (guaranteeView != null) {
                 double guaranteeWeight = calculateGuaranteedWeight(guaranteeView);
+                boolean isGuaranteed = isGuaranteed(guaranteeView);
                 ext.put("guaranteeView", guaranteeView.toString());
                 ext.put("guaranteeWeight", guaranteeWeight);
+                ext.put("isGuaranteed", isGuaranteed);
             }
         }
     }
@@ -239,6 +242,14 @@ public abstract class RankStrategyBasic implements RankStrategy {
         return guaranteeWeight;
     }
 
+    protected boolean isGuaranteed(GuaranteeView guaranteeView) {
+        if (guaranteeView == null) {
+            return false;
+        }
+        return guaranteeView.getGuaranteeNum() != null && guaranteeView.getGuaranteeNum() != 0
+                && guaranteeView.getGuaranteeRate() != null && guaranteeView.getGuaranteeRate() != 0.0;
+    }
+
     protected double getGuaranteeScoreCoefficient(ScoreParam scoreParam, Map<String, Object> ext) {
         if (ext.get("guaranteeWeight") != null && (double) ext.get("guaranteeWeight") == 0) {
             return 0.0;