Merge branch 'dev-xym-add-feature' into pre-master

# Conflicts:
#	ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy688.java

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/score/model/PAIModelV1.java

@@ -48,7 +48,7 @@ public class PAIModelV1 {
     };
 
     private static final String[] sparseUserLongFeatures = {
-            "vid", "apptype", "is_first_layer"
+            "vid", "apptype", "is_first_layer", "user_has_conver_1y"
     };
 
     private static final String[] sparseSceneLongFeatures = {
@@ -60,7 +60,7 @@ public class PAIModelV1 {
     };
 
     private static final String[] sparseAdStrFeatures = {
-            "profession", "creative_type", "creative_hook_embedding", "creative_why_embedding", "creative_action_embedding"
+            "profession"
     };
 
     private final String[] userFeatures = {

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -311,7 +311,7 @@ public class PredictModelServiceImpl implements PredictModelService {
             return result;
         } catch (Exception e) {
             log.error("svc=adPredict appType={} group={} newGroup={} pqtId={}"
-                    , requestParam.getAppType(), requestParam.getAbTestCode(), requestParam.getNewExpGroup(), requestParam.getPqtId());
+                    , requestParam.getAppType(), requestParam.getAbTestCode(), requestParam.getNewExpGroup(), requestParam.getPqtId(), e);
             result.put("ad_predict", 1);
             result.put("no_ad_strategy", "error");
             return result;

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

@@ -142,7 +142,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
         userFeatureMap.put("user_vid_return_cate2_14d", g1Feature.getOrDefault("cate2_14d", null));
         userFeatureMap.put("user_vid_share_cate1_14d", g2Feature.getOrDefault("cate1_14d", null));
         userFeatureMap.put("user_vid_share_cate2_14d", g2Feature.getOrDefault("cate2_14d", null));
-        log.info("userFeatureMap = {}", userFeatureMap);
+
         if (request.getAppType() != null) {
             userFeatureMap.put("apptype", String.valueOf(request.getAppType()));
         }
@@ -380,19 +380,6 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             String cpa = b1Feature.get("cpa");
             cidFeatureMap.put("cpa", cpa);
         }
-        if (StringUtils.isNotBlank(b1Feature.get("creative_type"))) {
-            cidFeatureMap.put("creative_type", b1Feature.get("creative_type"));
-        }
-        if (StringUtils.isNotBlank(b1Feature.get("creative_hook_embedding"))) {
-            cidFeatureMap.put("creative_hook_embedding", b1Feature.get("creative_hook_embedding"));
-        }
-        if (StringUtils.isNotBlank(b1Feature.get("creative_why_embedding"))) {
-            cidFeatureMap.put("creative_why_embedding", b1Feature.get("creative_why_embedding"));
-        }
-        if (StringUtils.isNotBlank(b1Feature.get("creative_type"))) {
-            cidFeatureMap.put("creative_type", b1Feature.get("creative_type"));
-        }
-
     }
 
     private void handleB2ToB5AndB8ToB9Feature(Map<String, Map<String, String>> c1Feature, Map<String, Map<String, String>> adVerFeature, Map<String, String> cidFeatureMap) {
@@ -475,6 +462,11 @@ public class RankStrategyBy688 extends RankStrategyBasic {
 
     private List<TupleMapEntry<Tuple5>> handleC1Feature(Map<String, String> c1Feature, Map<String, String> featureMap) {
 
+        //用户近1年内是否有转化
+        if (c1Feature.containsKey("user_has_conver_1y") && c1Feature.get("user_has_conver_1y") != null) {
+            featureMap.put("user_has_conver_1y", c1Feature.get("user_has_conver_1y"));
+        }
+
         // 用户特征
         List<TupleMapEntry<Tuple5>> midActionList = new ArrayList<>();
         if (c1Feature.containsKey("action")) {
@@ -778,10 +770,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             add("user_vid_return_cate2_14d");
             add("user_vid_share_cate1_14d");
             add("user_vid_share_cate2_14d");
-            add("creative_type");
-            add("creative_hook_embedding");
-            add("creative_why_embedding");
-            add("creative_action_embedding");
+            add("user_has_conver_1y");
         }};
     }