repair bug

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

@@ -74,45 +74,37 @@ object Recommendation_strategy_all {
       decive_id_oldUser.createOrReplaceTempView("device_id_old")
 
 
-      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}'
+      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'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 = 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}'
+      val imp_count_oldUser = 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'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 result = clk_count_oldUser.join(imp_count_oldUser,"stat_date")
+      val result = clk_count_oldUser.join(imp_count_oldUser,"stat_date")
         result.show()
 
 
 
-      }
-
-
 
 
     }