fix bug

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

@@ -74,43 +74,86 @@ object Recommendation_strategy_all {
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
-      decive_id_oldUser.show()
       decive_id_oldUser.createOrReplaceTempView("device_id_old")
 
-      val strategies = Seq("1$","^1$")
+      val strategies = Seq("1$","[^1]$")
       for (strategy <- strategies){
-        val clk_count_oldUser = sc.sql(
-          s"""
-             |select '${param.date}' as stat_date, count(cid_id) as get_clk_count_old
-             |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'${strategy}'
-             |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}'
+        if (strategy=="1$"){
+          val clk_count_oldUser_experiment = sc.sql(
+            s"""
+               |select '${param.date}' as stat_date, count(cid_id) as get_clk_count_old
+               |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'${strategy}'
+               |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_experiment = sc.sql(
+            s"""
+               |select '${param.date}' as stat_date, count(cid_id) as get_imp_count_old
+               |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'${strategy}'
+               |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 result1 = clk_count_oldUser_experiment.join(imp_count_oldUser_experiment,"stat_date")
+          result1.createOrReplaceTempView("temp1")
+        } else{
+          val clk_count_oldUser_all = sc.sql(
+            s"""
+               |select '${param.date}' as stat_date, count(cid_id) as get_clk_count_old
+               |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'${strategy}'
+               |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 get_imp_count_old
+               |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'${strategy}'
+               |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 result2 = clk_count_oldUser_all.join(imp_count_oldUser_all,"stat_date")
+          result2.createOrReplaceTempView("temp2")
 
-        val imp_count_oldUser = sc.sql(
+        }
+
+        val current_all = sc.sql(
           s"""
-             |select '${param.date}' as stat_date, count(cid_id) as get_imp_count_old
-             |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'${strategy}'
-             |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}'
+             |select a.stat_date,a.clk_count_oldUser_experiment,a.imp_count_oldUser_experiment,b.clk_count_oldUser_all,b.imp_count_oldUser_all
+             |from temp1 a  inner join temp2 b
+             |on a.stat_date = b.stat_date
          """.stripMargin
         )
 
 
-        val result = clk_count_oldUser.join(imp_count_oldUser,"stat_date")
+        val result = current_all
         result.show()
 
 
 
+
+
+
       }