repair bug

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

@@ -74,86 +74,66 @@ 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]$")
-      for (strategy <- strategies){
-        if (strategy=="1$"){
-          val clk_count_oldUser_experiment = sc.sql(
+
+      val clk_count_oldUser_experiment = sc.sql(
             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
                |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
-               |and jd.device_id regexp '${strategy}'
+               |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 ='${param.date}'
          """.stripMargin
           )
 
-          val imp_count_oldUser_experiment = sc.sql(
+      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
                |where je.cid_type = 'diary'
-               |and je.device_id regexp'${strategy}'
+               |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 ='${param.date}'
          """.stripMargin
           )
-          val result1 = clk_count_oldUser_experiment.join(imp_count_oldUser_experiment,"stat_date")
-          result1.createOrReplaceTempView("temp1")
-          result1.show()
-        } else{
-          val clk_count_oldUser_all = sc.sql(
+      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 regexp'${strategy}'
+               |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 ='${param.date}'
          """.stripMargin
           )
 
-          val imp_count_oldUser_all = sc.sql(
+      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 regexp'${strategy}'
+               |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 ='${param.date}'
          """.stripMargin
           )
-          val result2 = clk_count_oldUser_all.join(imp_count_oldUser_all,"stat_date")
-          result2.createOrReplaceTempView("temp2")
+          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")
           result2.show()
 
-        }
-
-
-      }
-      val current_all = sc.sql(
-        s"""
-           |select temp1.stat_date,temp1.clk_count_oldUser_experiment,temp1.imp_count_oldUser_experiment,temp2.clk_count_oldUser_all,temp2.imp_count_oldUser_all
-           |from temp1  join temp2
-           |on temp1.stat_date = temp2.stat_date
-         """.stripMargin
-      )
-
-
-      val result = current_all
-      result.show()
-
-
 
 
     }