新用户去掉用户黑名单

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

@@ -82,16 +82,17 @@ object testt {
       val device_id_newUser = sc.sql(
         s"""
            |select distinct(device_id) as device_id
-           |from online.ml_device_day_active_status
-           |where active_type != '4'
-           |and first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
+           |from online.ml_device_day_active_status os left join blacklist
+           |where os.active_type != '4'
+           |and os.first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
            |    ,'wanpu','jinshan','jx','maimai','zhuoyi','huatian','suopingjingling','mocha','mizhe','meika','lamabang'
            |    ,'js-az1','js-az2','js-az3','js-az4','js-az5','jfq-az1','jfq-az2','jfq-az3','jfq-az4','jfq-az5','toufang1'
            |    ,'toufang2','toufang3','toufang4','toufang5','toufang6','TF-toufang1','TF-toufang2','TF-toufang3','TF-toufang4'
            |    ,'TF-toufang5','tf-toufang1','tf-toufang2','tf-toufang3','tf-toufang4','tf-toufang5','benzhan','promotion_aso100'
            |    ,'promotion_qianka','promotion_xiaoyu','promotion_dianru','promotion_malioaso','promotion_malioaso-shequ'
            |    ,'promotion_shike','promotion_julang_jl03','','unknown')
-           |and partition_date ='${partition_date}'
+           |and os.partition_date ='${partition_date}'
+           |and blacklist.device_id is null
          """.stripMargin
       )
       device_id_newUser.show()
@@ -103,15 +104,15 @@ object testt {
            |select distinct(os.device_id) as device_id
            |from online.ml_device_day_active_status os left join blacklist
            |on os.device_id=blacklist.device_id
-           |where active_type = '4'
-           |and first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
+           |where os.active_type = '4'
+           |and os.first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
            |    ,'wanpu','jinshan','jx','maimai','zhuoyi','huatian','suopingjingling','mocha','mizhe','meika','lamabang'
            |    ,'js-az1','js-az2','js-az3','js-az4','js-az5','jfq-az1','jfq-az2','jfq-az3','jfq-az4','jfq-az5','toufang1'
            |    ,'toufang2','toufang3','toufang4','toufang5','toufang6','TF-toufang1','TF-toufang2','TF-toufang3','TF-toufang4'
            |    ,'TF-toufang5','tf-toufang1','tf-toufang2','tf-toufang3','tf-toufang4','tf-toufang5','benzhan','promotion_aso100'
            |    ,'promotion_qianka','promotion_xiaoyu','promotion_dianru','promotion_malioaso','promotion_malioaso-shequ'
            |    ,'promotion_shike','promotion_julang_jl03','','unknown')
-           |and partition_date ='${partition_date}'
+           |and os.partition_date ='${partition_date}'
            |and blacklist.device_id is null
          """.stripMargin
       )