修改mateFeature字段

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

@@ -130,8 +130,8 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250522 {
               featureMap.put("pqtid", pqtid)
               val extend: JSONObject = if (record.isNull("extend")) new JSONObject() else
                 JSON.parseObject(record.getString("extend"))
-              val mateFeature: JSONObject = if (record.isNull("metafeature")) new JSONObject() else
-                JSON.parseObject(record.getString("metafeature"))
+              val mateFeature: JSONObject = if (record.isNull("metafeaturemap")) new JSONObject() else
+                JSON.parseObject(record.getString("metafeaturemap"))
               val reqFeature: JSONObject = if (!mateFeature.containsKey("reqFeature")) new JSONObject() else
                 mateFeature.getJSONObject("reqFeature")
               val sceneFeature: JSONObject = if (!mateFeature.containsKey("sceneFeature")) new JSONObject() else
@@ -229,6 +229,10 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250522 {
                 featureMap.put("root_source_channel", reqFeature.getString("root_source_channel"))
               }
 
+              if (reqFeature.containsKey("brand") && reqFeature.getString("brand").nonEmpty) {
+                featureMap.put("brand", reqFeature.getString("brand"))
+              }
+
 
               if (b1.containsKey("cpa")) {
                 featureMap.put("cpa", b1.getString("cpa").toDouble)
@@ -524,13 +528,6 @@ object makedata_ad_33_bucketDataFromOriginToHive_20250522 {
                 featureMap.put("cate2", d3.getOrDefault("merge_second_level_cate", ""))
                 featureMap.put("title_split", d3.getOrDefault("title_split", ""))
               }
-              val machineinfo: JSONObject = if (record.isNull("machineinfo")) new JSONObject() else
-                JSON.parseObject(record.getString("machineinfo"))
-              if (machineinfo.containsKey("brand") && machineinfo.getString("brand").nonEmpty) {
-                featureMap.put("brand", machineinfo.getString("brand").toUpperCase)
-              } else {
-                featureMap.put("brand", "")
-              }
               featureMap.put("vid", record.getString("headvideoid"))
 
               /*