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

@@ -478,10 +478,10 @@ object icon_train_data {
 
 
       val stat_date = GmeiConfig.getMinusNDate(1)  //昨天
-    val qian_date = GmeiConfig.getMinusNDate(2)  //前天
-    //      val stat_date = param.date
+      val qian_date = GmeiConfig.getMinusNDate(2)  //前天
+//      val stat_date = param.date
     //println(param.date)
-    val partition_date = stat_date.replace("-","")
+      val partition_date = stat_date.replace("-","")
 
       //日记本点击数据
       val diary_click_1=sc.sql(
@@ -680,7 +680,7 @@ object icon_train_data {
       temp_meigou.createOrReplaceTempView("temp_meigou")
 
       // 百科点击数据
-      val wiki_click=sc.sql(
+      val wiki_click_1=sc.sql(
         s"""
            |SELECT cl_id as device_id,params['business_id'] as wiki_id
            |from online.tl_hdfs_maidian_view
@@ -688,8 +688,34 @@ object icon_train_data {
            |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_1.createOrReplaceTempView("wiki_click_1")
+
+      val wiki_click_2=sc.sql(
+        s"""
+           |select cl_id as device_id, params['card_id'] as wiki_id
+           |from online.tl_hdfs_maidian_view
+           |where action = 'on_click_card'
+           |and params['card_content_type']='wiki'
+           |and partition_date='${partition_date}'
+           |and params['card_id'] is not null
+       """.stripMargin
+      )
+      wiki_click_2.createOrReplaceTempView("wiki_click_2")
+
+      val wiki_click=sc.sql(
+        s"""
+           |select *
+           |from wiki_click_1
+           |union all
+           |select *
+           |from wiki_click_2
+       """.stripMargin
+      )
       wiki_click.createOrReplaceTempView("wiki_click")
 
+
+
+
       val wiki_tag=sc.sql(
         s"""
            |SELECT item_id,tag_id
@@ -781,7 +807,7 @@ object tag_value {
 
 
       val stat_date = GmeiConfig.getMinusNDate(1)
-      //      val stat_date = param.date
+//      val stat_date = param.date
       //println(param.date)
       val partition_date = stat_date.replace("-","")
 
@@ -1061,8 +1087,8 @@ object icon_data {
       sc.sql("use jerry_prod")
 
 
-//      val stat_date = GmeiConfig.getMinusNDate(1)
-      val stat_date = param.date
+      val stat_date = GmeiConfig.getMinusNDate(1)
+//      val stat_date = param.date
       //println(param.date)
       val partition_date = stat_date.replace("-","")