去除新埋点

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

@@ -477,22 +477,19 @@ object icon_train_data {
 
 
       val stat_date = GmeiConfig.getMinusNDate(1)  //昨天
-      val qian_date = GmeiConfig.getMinusNDate(2)  //前天
-      //      val stat_date = param.date
-      //println(param.date)
-      val partition_date = stat_date.replace("-","")
+    val qian_date = GmeiConfig.getMinusNDate(2)  //前天
+    //      val stat_date = param.date
+    //println(param.date)
+    val partition_date = stat_date.replace("-","")
 
-//日记本点击数据
+      //日记本点击数据
       val diary_click=sc.sql(
         s"""
-           |select cl_id as device_id,
-           |if(action='on_click_diary_card',params['diary_id'],
-           |if(action='on_click_card' and params['card_content_type']='diary',params['card_id']
-           |)) as diary_id
+           |select cl_id as device_id, params['diary_id'] as diary_id
            |from online.tl_hdfs_maidian_view
-           |where action in ('on_click_diary_card','on_click_card')
+           |where action = 'on_click_diary_card'
            |and partition_date='${partition_date}'
-           |and (params['diary_id'] is not null) or (params['card_id'] is not null)
+           |and params['diary_id'] is not null
        """.stripMargin
       )
       diary_click.show()
@@ -529,18 +526,15 @@ object icon_train_data {
 
 
 
-//      美购点击数据
+      //      美购点击数据
 
       val meigou_click=sc.sql(
         s"""
-           |select cl_id as device_id,
-           |if(action='goto_welfare_detail',params['service_id'],
-           |if(action='on_click_card' and params['card_content_type']='service',params['card_id']
-           |))as service_id
+           |select cl_id as device_id, params['service_id'] as service_id
            |from online.tl_hdfs_maidian_view
-           |where action in ('goto_welfare_detail','on_click_card')
+           |where action = 'goto_welfare_detail'
            |and partition_date='${partition_date}'
-           |and (params['service_id'] is not null) or (params['card_id'] is not null)
+           |and params['service_id'] is not null
        """.stripMargin
       )
       meigou_click.show()
@@ -637,7 +631,7 @@ object icon_train_data {
            |SELECT cl_id as device_id,params['business_id'] as wiki_id
            |from online.tl_hdfs_maidian_view
            |where partition_date='${partition_date}'
-           |and action in ('Search_result_wiki_click_item','search_result_click_infomation_item', 'search_result_wiki_click_recommend_wiki')
+           |and (action='Search_result_wiki_click_item' or action='search_result_click_infomation_item' or action='search_result_wiki_click_recommend_wiki')
        """.stripMargin
       )
       wiki_click.createOrReplaceTempView("wiki_click")
@@ -692,6 +686,7 @@ object icon_train_data {
 
 
 
+
 object tag_value {
 
   Logger.getLogger("org.apache.spark").setLevel(Level.WARN)