去除机构和黑名单

eda/feededa/src/main/scala/com/gmei/app_list.scala

@@ -94,6 +94,8 @@ object app_list {
         s"""
            |select *
            |from device_id
+           |where device_id not in (select device_id from bl_device_list)
+           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       val tempp=temp.withColumn("stat_date",addCol(temp("device_id")))
@@ -202,8 +204,6 @@ object coincidence_xinyang {
            |select '${data}' as stat_date,count(distinct(device_id)) as yesterday_coincidence_num
            |from device_id_coincidence
            |where stat_date = '${data}'
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       //2.每日活跃总用户数(采用曝光计算)
@@ -213,8 +213,6 @@ object coincidence_xinyang {
            |from data_feed_exposure
            |where stat_date = '${yesterday}'
            |and device_type !='App Store'
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
 
@@ -226,8 +224,6 @@ object coincidence_xinyang {
            |select '${data}' as stat_date,count(distinct(device_id)) as week_coincidence_num
            |from device_id_coincidence
            |where stat_date > '${week_day}'
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       //2.每周活跃总用户(采用曝光计算)
@@ -237,8 +233,6 @@ object coincidence_xinyang {
            |from data_feed_exposure
            |where stat_date > '${pre_weekday}'
            |and device_type !='App Store'
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
 
@@ -250,8 +244,6 @@ object coincidence_xinyang {
            |select '${data}' as stat_date,count(distinct(device_id)) as month_coincidence_num
            |from device_id_coincidence
            |where stat_date > '${month_day}'
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       //2.0 每月活跃总用户（采用曝光计算）
@@ -260,9 +252,6 @@ object coincidence_xinyang {
            |select '${data}' as stat_date,count(distinct(device_id)) as month_expoure_num
            |from data_feed_exposure
            |where stat_date > '${pre_monthday}'
-           |and device_type !='App Store'
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
 
@@ -284,8 +273,6 @@ object coincidence_xinyang {
            |and  pay_time  is  not  null
            |and  pay_time  >=  '2017-11-18'
            |and device_id in (select distinct(device_id) from device_id_coincidence)
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       meigou_coincidence_num.show()
@@ -300,8 +287,6 @@ object coincidence_xinyang {
            |and  pay_time  is  not  null
            |and  pay_time  >=  '2017-11-18'
            |and device_id in (select distinct(device_id) from device_id_coincidence)
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       meigou_pay_device.show()
@@ -314,8 +299,6 @@ object coincidence_xinyang {
            |and  pay_time  is  not  null
            |and  pay_time  >=  '2017-11-18'
            |and device_id in (select distinct(device_id) from device_id_coincidence)
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       meigou_pay_all.show()
@@ -329,8 +312,6 @@ object coincidence_xinyang {
            |and  pay_time  is  not  null
            |and  pay_time  >=  '2017-11-18'
            |and device_id in (select distinct(device_id) from device_id_coincidence)
-           |and device_id not in (select device_id from bl_device_list)
-           |and device_id not in (select device_id from blacklist)
          """.stripMargin
       )
       meigou_pay_device_all.show()
@@ -367,8 +348,6 @@ object coincidence_xinyang {
            |where partition_date > '20180101'
            |and action = 'welfare_detail_click_message'
            |and cl_id in (select distinct(device_id) from device_id_coincidence)
-           |and cl_id not in (select device_id from bl_device_list)
-           |and cl_id not in (select device_id from blacklist)
          """.stripMargin
       )
       zixun_num_co.show()
@@ -380,8 +359,6 @@ object coincidence_xinyang {
            |where partition_date > '20180101'
            |and action = 'welfare_detail_click_message'
            |and cl_id in (select distinct(device_id) from device_id_coincidence)
-           |and cl_id not in (select device_id from bl_device_list)
-           |and cl_id not in (select device_id from blacklist)
          """.stripMargin
       )
       zixun_num_co_dis.show()