Merge branch 'dev-xym-add-feature' of algorithm/recommend-emr-dataprocess into feature/20250104-zt-update

src/main/scala/com/aliyun/odps/spark/examples/makedata_ad/v20240718/makedata_ad_33_bucketDataFromOriginToHive_20250228.scala

@@ -78,7 +78,7 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250228 {
       "user_vid_return_tags_14d", "apptype", "ts", "mid", "pqtid", "hour", "hour_quarter", "root_source_scene",
       "root_source_channel", "is_first_layer", "title_split", "profession", "user_vid_share_tags_1d", "user_vid_share_tags_14d",
       "user_vid_return_cate1_14d", "user_vid_return_cate2_14d", "user_vid_share_cate1_14d", "user_vid_share_cate2_14d",
-      "creative_type", "creative_hook_embedding", "creative_why_embedding", "creative_action_embedding")
+      "creative_type", "creative_hook_embedding", "creative_why_embedding", "creative_action_embedding","user_has_conver_1y")
 
 
     // 2 读取odps+表信息
@@ -326,6 +326,10 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250228 {
               featureMap.put("cvr_all", RankExtractorFeature_20240530.calDiv(clickAll, converAll))
               featureMap.put("ecpm_all", RankExtractorFeature_20240530.calDiv(incomeAll * 1000, viewAll))
 
+              if (c1.containsKey("user_has_conver_1y") && c1.getInteger("user_has_conver_1y") != null) {
+                featureMap.put("user_has_conver_1y", c1.getInteger("user_has_conver_1y"))
+              }
+
               // ui特征
               val midTimeDiff = scala.collection.mutable.Map[String, Double]()
               midActionList.foreach {