Merge branch 'dev-xym-add-features1' 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

@@ -73,7 +73,7 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250228 {
       "user_cid_click_list", "user_cid_conver_list",
       "user_vid_return_tags_2h", "user_vid_return_tags_1d", "user_vid_return_tags_3d", "user_vid_return_tags_7d",
       "user_vid_return_tags_14d", "apptype", "ts", "mid", "pqtid", "hour", "hour_quarter", "root_source_scene",
-      "root_source_channel", "is_first_layer", "title_split", "profession")
+      "root_source_channel", "is_first_layer", "title_split", "profession", "user_vid_share_tags_1d", "user_vid_share_tags_14d")
 
 
     // 2 读取odps+表信息
@@ -425,6 +425,13 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250228 {
                 featureMap.put("user_vid_return_tags_14d", e1.getString("tags_14d"))
               }
 
+              if (e2.containsKey("tags_14d") && e2.getString("tags_14d").nonEmpty) {
+                featureMap.put("user_vid_share_tags_1d", e2.getString("tags_1d"))
+              }
+              if (e2.containsKey("tags_14d") && e2.getString("tags_14d").nonEmpty) {
+                featureMap.put("user_vid_share_tags_14d", e2.getString("tags_14d"))
+              }
+
 
               val d1: JSONObject = if (record.isNull("d1_feature")) new JSONObject() else
                 JSON.parseObject(record.getString("d1_feature"))