adx iqiyi packagenames insert to dmp

src/main/scala/mobvista/dmp/datasource/dsp/DspOrgEtlDailys.scala

@@ -380,7 +380,6 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
       //  2020.12.24 添加 2890对应的 com.meituan.itakeaway和 com.meituan.itakeaway_oppo 入库
       //  2021.01.06添加  快手、快手极速版、优酷
       //  2021.04.22 添加adx（exchanges字段）为oppo且dealid=3160，则伪包名为com.tencent.news_oppo和com.tencent.news
-      var numbers = Set(2716, 2717, 2718, 2783, 2840, 2889, 2890, 2904, 2905, 2906, 3160)
       var mapData: Map[Int, String] = Map(2716 -> "com.jingdong.app.mall",
         2717 -> "com.eg.android.AlipayGphone",
         2718 -> "com.qiyi.video",
@@ -392,31 +391,30 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
         2905 -> "com.kuaishou.nebula",
         2906 -> "com.youku.phone",
         3160 -> "com.tencent.news")
-      for (num <- numbers) {
-        if (dealeridArray.contains(num.toString)) {
+      for (item <- mapData) {
+        if (dealeridArray.contains(item._1.toString)) {
           /*
           arrayBuffer = addDatas(arrayBuffer, imei, imeimd5, oaid, oaidmd5, deviceId, deviceType, platform, country, ip, gender, birthday, maker, model, osVersion,
             mapData(num), androidId, time, segment, region)
           arrayBuffer = addDatas(arrayBuffer, imei, imeimd5, oaid, oaidmd5, deviceId, deviceType, platform, country, ip, gender, birthday, maker, model, osVersion,
             mapData(num) + "_oppo", androidId, time, segment, region)
           */
-          value.packageName = s"${mapData(num)}"
+          value.packageName = item._2
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
-          value.packageName = s"${mapData(num)}_oppo"
+          value.packageName = item._2+"_oppo"
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
         }
       }
       //2020.11.11添加快手、京东入库
-      numbers = Set(2774, 2773)
       mapData = Map(2774 -> "com.smile.gifmaker_notinstall_oppo",
         2773 -> "com.jingdong.app.mallr_notinstall_oppo")
-      for (num <- numbers) {
-        if (dealeridArray.contains(num.toString)) {
+      for (item <- mapData) {
+        if (dealeridArray.contains(item._1.toString)) {
           /*
           arrayBuffer = addDatas(arrayBuffer, imei, imeimd5, oaid, oaidmd5, deviceId, deviceType, platform, country, ip, gender, birthday, maker, model, osVersion,
             mapData(num), androidId, time, segment, region)
           */
-          value.packageName = s"${mapData(num)}"
+          value.packageName = item._2
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
         }
       }
@@ -435,7 +433,6 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
     //2020.11.26 增加bes入库需求
     // wiki   https://confluence.mobvista.com/pages/viewpage.action?pageId=47976499
     //2021.04.22 添加adx（exchanges字段）为bes且dealid=100188，则伪包名为com.tencent.news_bes和com.tencent.news
-    val numbers_bes = Set(100193, 100189, 100191, 100187, 100194, 100195, 100196, 100197, 100188)
     val mapData_bes = Map(100193 -> "com.taobao.taobao",
       100189 -> "com.eg.android.AlipayGphone",
       100191 -> "com.jingdong.app.mall",
@@ -446,17 +443,17 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
       100197 -> "id387682726",
       100188 -> "com.tencent.news")
     if ("bes".equals(exchanges)) {
-      for (num <- numbers_bes) {
-        if (dealeridArray.contains(num.toString)) {
+      for (item <- mapData_bes) {
+        if (dealeridArray.contains(item._1.toString)) {
           /*
           arrayBuffer = addDatas(arrayBuffer, imei, imeimd5, oaid, oaidmd5, deviceId, deviceType, platform, country, ip, gender, birthday, maker, model, osVersion,
             mapData_bes(num), androidId, time, segment, region)
           arrayBuffer = addDatas(arrayBuffer, imei, imeimd5, oaid, oaidmd5, deviceId, deviceType, platform, country, ip, gender, birthday, maker, model, osVersion,
             mapData_bes(num) + "_bes", androidId, time, segment, region)
           */
-          value.packageName = s"${mapData_bes(num)}"
+          value.packageName = item._2
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
-          value.packageName = s"${mapData_bes(num)}_bes"
+          value.packageName = item._2+"_bes"
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
         }
       }
@@ -472,6 +469,24 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
         arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
       }
     }
+
+    val mapData_iqiyi = Map(5260 -> "com.taobao.taobao",
+      1301 -> "com.UCMobile",
+      10949 -> "com.eg.android.AlipayGphone",
+      6242 -> "com.taobao.idlefish",
+      3996 -> "com.sankuai.meituan",
+      7156 -> "com.tencent.news")
+    if("iqiyi".equals(exchanges)){
+      for (item <- mapData_iqiyi) {
+        if (dealeridArray.contains(item._1.toString)) {
+          value.packageName = item._2
+          arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
+          value.packageName = item._2+"_iqiyi"
+          arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
+        }
+      }
+    }
+
     //adx=iqiyi 且os=android的imeiMD5和oaidMD5去重设备， 分别和com.taobao.foractivation.227229和com.taobao.foractivation.227229_oaid做差集   2020.12.15
     //2021.04.22下掉,该需求不需要了
     //    if("iqiyi".equals(exchanges)){

src/main/scala/mobvista/dmp/datasource/dsp/DspOrgLogEtlHoursDemo.scala

@@ -141,7 +141,7 @@ class DspOrgLogEtlHoursDemo extends CommonSparkJob with Serializable {
     val exitId = row.getAs[String]("exitid")
     val exchanges = row.getAs[String]("exchanges")
     var dealerid = ""
-    if("mopub".equalsIgnoreCase(exchanges)  || "oppocn".equalsIgnoreCase(exchanges)  || "inmobi".equalsIgnoreCase(exchanges) || "bes".equalsIgnoreCase(exchanges) ){
+    if("mopub".equalsIgnoreCase(exchanges)  || "oppocn".equalsIgnoreCase(exchanges)  || "inmobi".equalsIgnoreCase(exchanges) || "bes".equalsIgnoreCase(exchanges)  || "iqiyi".equalsIgnoreCase(exchanges)  ){
       val ext3 = row.getAs[String]("ext3")
       if(StringUtils.isNotBlank(ext3) && ext3.startsWith("{")){
         try{