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

删除日记id、日期特征、tab点击特征，增加日记平均消费时间、用户点击日记次数最多的类别

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

@@ -283,8 +283,8 @@ object ARPU_COM {
            |and final_id.device_id is  null
            |and md.partition_date = '20181218'
            |and  md.pay_time  is  not  null
-           |and  md.pay_time  >=  '2018-04-01'
-           |and md.pay_time  <=  '2018-04-30'
+           |and  md.pay_time  >=  '2018-05-01'
+           |and md.pay_time  <=  '2018-05-31'
        """.stripMargin
       )
       diary_clk_all.show(80)
@@ -294,7 +294,7 @@ object ARPU_COM {
         s"""
            |select count(distinct(device_id)) as active_num
            |from online.ml_device_month_active_status
-           |where partition_date = '20180430'
+           |where partition_date = '20180531'
            |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')
        """.stripMargin
       )