Merge branch 'jiangfan'

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

@@ -474,8 +474,8 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
     //2021.06.17  天级别从dsp请求日志（adn_dsp.log_adn_dsp_request_orc_hour）中拉取exchanges='kuaishou' 并且appid 符合下列名称的入库
     val mapData_kuaishou = Map("com.smile.gifmaker" -> "com.smile.gifmaker_fromkuaishou",
       "com.kuaishou.nebula" -> "com.kuaishou.nebula_fromkuaishou",
-      "440948110" -> "440948110_20210617",
-      "1472502819" -> "1472502819_20210617")
+      "440948110" -> "44094811020210617",
+      "1472502819" -> "147250281920210617")
     if ("kuaishou".equals(exchanges)) {
       for (item <- mapData_kuaishou) {
         if (packageName.split("#", -1).contains(item._1)) {
@@ -500,7 +500,7 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, gaidmd5, imei, imeimd5, oaid, oaidmd5, androidId, idfv, deviceType, platform, value)
         }
       }
-    //2021.06.17 若adx（exchanges字段）为iqiyi且dealid=112644(安装) 且os = 'android'，则伪包名为com.taobao.litetao_iqiyi和com.taobao.litetao   若adx（exchanges字段）为iqiyi且dealid=112644（安装）且os='ios'，则安装包名为1340376323_iqiyi和1340376323
+    //2021.06.17 若adx（exchanges字段）为iqiyi且dealid=112644(安装) 且os = 'android'，则伪包名为com.taobao.litetao_iqiyi和com.taobao.litetao   若adx（exchanges字段）为iqiyi且dealid=112644（安装）且os='ios'，则安装包名为134037632320210617和1340376323
       if (dealeridArray.contains("112644")) {
         if("android".equalsIgnoreCase(platform)){
           value.packageName = "com.taobao.litetao"
@@ -510,7 +510,7 @@ class DspOrgEtlDailys extends CommonSparkJob with Serializable {
         }else{
           value.packageName = "1340376323"
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, "", "", "", "", "", "", idfv, deviceType, "ios", value)
-          value.packageName = "1340376323_iqiyi"
+          value.packageName = "134037632320210617"
           arrayBuffer = addDatasV2(arrayBuffer, deviceId, "", "", "", "", "", "", idfv, deviceType, "ios", value)
         }
       }