repair

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

@@ -61,7 +61,7 @@ object Recommendation_strategy_all {
       val partition_date = param.date.replace("-","")
       val decive_id_oldUser = sc.sql(
         s"""
-           |select distinct(device_id) as decive_id
+           |select distinct(device_id) as device_id
            |from online.ml_device_day_active_status
            |where active_type = '4'
            |and first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
@@ -81,7 +81,7 @@ object Recommendation_strategy_all {
         s"""
            |select '${param.date}' as stat_date, count(cid_id) as clk_count_oldUser_experiment
            |from data_feed_click jd inner join device_id_old
-           |on jd.device_id = device_id_old.decive_id
+           |on jd.device_id = device_id_old.device_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)
@@ -89,12 +89,13 @@ object Recommendation_strategy_all {
            |and jd.stat_date ='${param.date}'
          """.stripMargin
           )
+      clk_count_oldUser_experiment.show()
 
       val imp_count_oldUser_experiment = sc.sql(
         s"""
            |select '${param.date}' as stat_date, count(cid_id) as imp_count_oldUser_experiment
            |from data_feed_exposure je inner join device_id_old
-           |on je.device_id = device_id_old.decive_id
+           |on je.device_id = device_id_old.device_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)
@@ -102,11 +103,12 @@ object Recommendation_strategy_all {
            |and je.stat_date ='${param.date}'
          """.stripMargin
           )
+      imp_count_oldUser_experiment.show()
       val clk_count_oldUser_all = sc.sql(
         s"""
            |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
+           |on jd.device_id = device_id_old.device_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)
@@ -115,11 +117,13 @@ object Recommendation_strategy_all {
          """.stripMargin
           )
 
+      clk_count_oldUser_all.show()
+
       val imp_count_oldUser_all = sc.sql(
         s"""
            |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
+           |on je.device_id = device_id_old.device_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)
@@ -127,6 +131,7 @@ object Recommendation_strategy_all {
            |and je.stat_date ='${param.date}'
          """.stripMargin
           )
+      imp_count_oldUser_all.show()
       val result2 = clk_count_oldUser_experiment.join(imp_count_oldUser_experiment,"stat_date")
               .join(clk_count_oldUser_all,"stat_date")
               .join(imp_count_oldUser_all,"stat_date")