先将之前的数据取出

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

@@ -53,9 +53,9 @@ object Recommendation_strategy_all {
 
 
       import sc.implicits._
-      val stat_date = GmeiConfig.getMinusNDate(1)
+      //val stat_date = GmeiConfig.getMinusNDate(1)
       //println(param.date)
-      val partition_date = stat_date.replace("-","")
+      val partition_date = param.date.replace("-","")
       val decive_id_oldUser = sc.sql(
         s"""
            |select distinct(device_id) as decive_id
@@ -76,51 +76,51 @@ object Recommendation_strategy_all {
 
       val clk_count_oldUser_Contrast = sc.sql(
         s"""
-           |select '${stat_date}' as stat_date, count(cid_id) as clk_count_oldUser_Contrast
+           |select '${param.date}' as stat_date, count(cid_id) as clk_count_oldUser_Contrast
            |from data_feed_click jd inner join device_id_old
            |on jd.device_id = device_id_old.decive_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id regexp'1$$'
            |and jd.device_id not in (select device_id from bl_device_list)
            |and jd.device_id not in (select device_id from blacklist)
-           |and jd.stat_date ='${stat_date}'
+           |and jd.stat_date ='${param.date}'
          """.stripMargin
         )
 
       val imp_count_oldUser_Contrast = sc.sql(
         s"""
-           |select '${stat_date}' as stat_date, count(cid_id) as imp_count_oldUser_Contrast
+           |select '${param.date}' as stat_date, count(cid_id) as imp_count_oldUser_Contrast
            |from data_feed_exposure je inner join device_id_old
            |on je.device_id = device_id_old.decive_id
            |where je.cid_type = 'diary'
            |and je.device_id regexp'1$$'
            |and je.device_id not in (select device_id from bl_device_list)
            |and je.device_id not in (select device_id from blacklist)
-           |and je.stat_date ='${stat_date}'
+           |and je.stat_date ='${param.date}'
          """.stripMargin
         )
 
       val clk_count_oldUser_all = sc.sql(
         s"""
-           |select '${stat_date}' as stat_date, count(cid_id) as clk_count_oldUser_all
+           |select '${param.date}' as stat_date, count(cid_id) as clk_count_oldUser_all
            |from data_feed_click jd inner join device_id_old
            |on jd.device_id = device_id_old.decive_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id not in (select device_id from bl_device_list)
            |and jd.device_id not in (select device_id from blacklist)
-           |and jd.stat_date ='${stat_date}'
+           |and jd.stat_date ='${param.date}'
          """.stripMargin
       )
 
       val imp_count_oldUser_all = sc.sql(
         s"""
-           |select '${stat_date}' as stat_date, count(cid_id) as imp_count_oldUser_all
+           |select '${param.date}' as stat_date, count(cid_id) as imp_count_oldUser_all
            |from data_feed_exposure je inner join device_id_old
            |on je.device_id = device_id_old.decive_id
            |where je.cid_type = 'diary'
            |and je.device_id not in (select device_id from bl_device_list)
            |and je.device_id not in (select device_id from blacklist)
-           |and je.stat_date ='${stat_date}'
+           |and je.stat_date ='${param.date}'
          """.stripMargin
       )
 
@@ -136,25 +136,25 @@ object Recommendation_strategy_all {
 
       val clk_count_oldUser_Cover = sc.sql(
         s"""
-           |select '${stat_date}' as stat_date, count(cid_id) as clk_count_oldUser_Cover
+           |select '${param.date}' as stat_date, count(cid_id) as clk_count_oldUser_Cover
            |from data_feed_click jd inner join device_id_cover_older
            |on jd.device_id = device_id_cover_older.device_id
            |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
            |and jd.device_id not in (select device_id from bl_device_list)
            |and jd.device_id not in (select device_id from blacklist)
-           |and jd.stat_date ='${stat_date}'
+           |and jd.stat_date ='${param.date}'
          """.stripMargin
       )
 
       val imp_count_oldUser_Cover = sc.sql(
         s"""
-           |select '${stat_date}' as stat_date, count(cid_id) as imp_count_oldUser_Cover
+           |select '${param.date}' as stat_date, count(cid_id) as imp_count_oldUser_Cover
            |from data_feed_exposure je inner join device_id_cover_older
            |on je.device_id = device_id_cover_older.device_id
            |where je.cid_type = 'diary'
            |and je.device_id not in (select device_id from bl_device_list)
            |and je.device_id not in (select device_id from blacklist)
-           |and je.stat_date ='${stat_date}'
+           |and je.stat_date ='${param.date}'
          """.stripMargin
       )