repair bug

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

@@ -77,65 +77,61 @@ object Recommendation_strategy_all {
       decive_id_oldUser.show()
       decive_id_oldUser.createOrReplaceTempView("device_id_old")
 
-      val strategies = Seq("1$","[^1]$")
-
       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 '[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}'
+        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 '[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(
-            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'[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}'
+        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'[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 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'[^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}'
+        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'[^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(
-            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'[^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}'
+        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'[^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_experiment.join(imp_count_oldUser_experiment,"stat_date")
+      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()
 
-
-
     }