瀏覽代碼

feat:修改无回传判断逻辑

zhaohaipeng 4 月之前
父節點
當前提交
ec736129b2

+ 4 - 1
src/main/java/examples/utils/AdUtil.java

@@ -57,7 +57,10 @@ public class AdUtil {
             return false;
         }
         if (extendAlgJson.containsKey("extinfo")) {
-            return IS_API_FLAG.equals(extendAlgJson.getJSONObject("extinfo").getString("isApi"));
+            JSONObject extInfoJson = extendAlgJson.getJSONObject("extinfo");
+            if (extInfoJson.containsKey("isApi")) {
+                return IS_API_FLAG.equals(extInfoJson.getString("isApi"));
+            }
         }
         if (extendAlgJson.containsKey("is_api")) {
             return IS_API_FLAG.equals(extendAlgJson.getString("is_api"));

+ 2 - 11
src/main/scala/com/aliyun/odps/spark/examples/makedata_ad/v20240718/makedata_ad_31_originData_20240718.scala

@@ -5,7 +5,7 @@ import com.aliyun.odps.TableSchema
 import com.aliyun.odps.data.Record
 import com.aliyun.odps.spark.examples.myUtils.{MyDateUtils, MyHdfsUtils, ParamUtils, env}
 import examples.extractor.RankExtractorFeature_20240530
-import examples.utils.DateTimeUtil
+import examples.utils.{AdUtil, DateTimeUtil}
 import org.apache.hadoop.io.compress.GzipCodec
 import org.apache.spark.sql.SparkSession
 import org.xm.Similarity
@@ -55,16 +55,7 @@ object makedata_ad_31_originData_20240718 {
             transfer = func,
             numPartition = tablePart)
           .filter(record => {
-            val extendAlg: JSONObject = if (record.isNull("extend_alg")) new JSONObject() else
-              JSON.parseObject(record.getString("extend_alg"))
-            var isApi = extendAlg.getString("is_api")
-            if (extendAlg.containsKey("extinfo")) {
-              val extInfoJson = extendAlg.getJSONObject("extinfo")
-              if (extInfoJson.containsKey("isApi")) {
-                isApi = extInfoJson.getString("isApi")
-              }
-            }
-            "1".equals(isApi)
+            AdUtil.isApi(record)
           })
           .map(record => {