repair bug

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

@@ -53,7 +53,7 @@ object Recommendation_strategy_all {
 
       import sc.implicits._
       //      val stat_date = GmeiConfig.getMinusNDate(1)
-      println(param.date)
+      //println(param.date)
       val partition_date = param.date.replace("-","")
       val decive_id_oldUser = sc.sql(
         s"""
@@ -70,13 +70,12 @@ object Recommendation_strategy_all {
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
-      decive_id_oldUser.show()
       decive_id_oldUser.createOrReplaceTempView("device_id_old")
 
 
-      val clk_count_oldUser = sc.sql(
+      val clk_count_oldUser_Contrast = sc.sql(
         s"""
-           |select '${param.date}' as stat_date, count(cid_id) as get_clk_count_old
+           |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')
@@ -87,9 +86,9 @@ object Recommendation_strategy_all {
          """.stripMargin
         )
 
-      val imp_count_oldUser = sc.sql(
+      val imp_count_oldUser_Contrast = sc.sql(
         s"""
-           |select '${param.date}' as stat_date, count(cid_id) as get_imp_count_old
+           |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'
@@ -100,11 +99,34 @@ object Recommendation_strategy_all {
          """.stripMargin
         )
 
-      val result = clk_count_oldUser.join(imp_count_oldUser,"stat_date")
-        result.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
+           |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 ='${param.date}'
+         """.stripMargin
+      )
 
+      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
+           |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 ='${param.date}'
+         """.stripMargin
+      )
 
+      val result = clk_count_oldUser_Contrast.join(imp_count_oldUser_Contrast,"stat_date")
+          .join(clk_count_oldUser_all,"stat_date")
+          .join(imp_count_oldUser_all,"stat_date")
+        result.show()
 
 
     }