Merge branch 'master' of git.wanmeizhensuo.com:ML/ffm-baseline

change test file

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

@@ -101,7 +101,7 @@ object data_feed_exposure_precise {
            |    ,'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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and device_id not in
            |       (SELECT cl_id
            |        FROM online.ml_hospital_spam_pv_day

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

@@ -68,7 +68,7 @@ object find_bug {
            |    ,'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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
@@ -255,14 +255,14 @@ object find_bug {
         s"""
            |select distinct(device_id) as device_id
            |from online.ml_device_day_active_status
-           |where active_type != '4'
+           |where (active_type = '1' or active_type = '2')
            |and 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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
@@ -404,7 +404,7 @@ object CTR_precise {
            |    ,'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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
@@ -479,14 +479,14 @@ object CTR_precise {
         s"""
            |select distinct(device_id) as device_id
            |from online.ml_device_day_active_status
-           |where active_type != '4'
+           |where (active_type = '1' or active_type = '2')
            |and 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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and partition_date ='${partition_date}'
          """.stripMargin
       )

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

@@ -100,14 +100,14 @@ object temp_analysis {
            |select distinct(oms.device_id) as device_id
            |from online.ml_device_day_active_status oms left join final_id
            |on oms.device_id=final_id.device_id
-           |where oms.active_type != '4'
+           |where (oms.active_type = '2' or oms.active_type='1')
            |and oms.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')
+           |        ,'promotion_shike','promotion_julang_jl03','promotion_zuimei')
            |and oms.partition_date ='${partition_date}'
            |and final_id.device_id is  null
          """.stripMargin

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

@@ -75,7 +75,7 @@ object temp_count {
            |    ,'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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
@@ -270,7 +270,7 @@ object Repeated_content_recommendation {
            |    ,'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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and om.partition_date ='${partition_date}'
            |and agency_id.device_id is null
          """.stripMargin
@@ -284,14 +284,14 @@ object Repeated_content_recommendation {
            |select distinct(om.device_id) as device_id
            |from online.ml_device_day_active_status om left join agency_id
            |on om.device_id = agency_id.device_id
-           |where om.active_type != '4'
+           |where (om.active_type = '1' or om.active_type='2')
            |and om.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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and om.partition_date ='${partition_date}'
            |and agency_id.device_id is null
          """.stripMargin
@@ -868,14 +868,14 @@ object find_reason {
            |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 os.active_type != '4'
+           |where (os.active_type = '1' or os.active_type='2')
            |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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and os.partition_date ='${partition_date}'
            |and blacklist.device_id is null
          """.stripMargin
@@ -896,7 +896,7 @@ object find_reason {
            |    ,'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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and os.partition_date ='${partition_date}'
            |and blacklist.device_id is null
          """.stripMargin

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

@@ -87,14 +87,14 @@ 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 os.active_type != '4'
+           |where (os.active_type = '1' or os.active_type='2')
            |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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and os.partition_date ='${partition_date}'
            |and blacklist.device_id is null
          """.stripMargin
@@ -115,7 +115,7 @@ object testt {
            |    ,'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')
+           |    ,'promotion_shike','promotion_julang_jl03','','unknown','promotion_zuimei')
            |and os.partition_date ='${partition_date}'
            |and blacklist.device_id is null
          """.stripMargin
@@ -616,7 +616,7 @@ object diary_clk_card {
         s"""
            |select distinct(device_id) as device_id
            |from online.ml_device_day_active_status
-           |where active_type != '4'
+           |where (active_type = '1' or active_type = '2')
            |and 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'