add new user

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

@@ -60,15 +60,53 @@ object strategy_clk_imp_oldUser {
          """.stripMargin
       )
       decive_id_oldUser.show()
-      decive_id_oldUser.createOrReplaceTempView("device_id_tmp1")
+      decive_id_oldUser.createOrReplaceTempView("device_id_old")
+
+      val decive_id_newUser = sc.sql(
+        s"""
+           |select distinct(device_id) as decive_id_newUser
+           |from online.ml_device_day_active_status
+           |where active_type = '[1|2|3]'
+           |and partition_date ='${partition_date}'
+         """.stripMargin
+      )
+      decive_id_oldUser.show()
+      decive_id_oldUser.createOrReplaceTempView("device_id_newUser")
 
       val strategies = Seq("[1|2]$","[3|4]$","[5|6]$","[7|8]$")
       for (strategy <- strategies){
-        val clk_count = sc.sql(
+        val clk_count_oldUser = sc.sql(
+          s"""
+             |select '${stat_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_oldUser
+             |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 ='${stat_date}'
+         """.stripMargin
+        )
+
+        val imp_count_oldUser = sc.sql(
+          s"""
+             |select '${stat_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_oldUser
+             |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 ='${stat_date}'
+         """.stripMargin
+        )
+
+
+        val clk_count_newUser = sc.sql(
           s"""
-             |select '${stat_date}' as stat_date, count(cid_id) as get_clk_count
-             |from data_feed_click jd inner join device_id_tmp1
-             |on jd.device_id = device_id_tmp1.decive_id_oldUser
+             |select '${stat_date}' as stat_date, count(cid_id) as get_clk_count_newUser
+             |from data_feed_click jd inner join device_id_newUser
+             |on jd.device_id = device_id_newUser.decive_id_newUser
              |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)
@@ -77,11 +115,11 @@ object strategy_clk_imp_oldUser {
          """.stripMargin
         )
 
-        val imp_count = sc.sql(
+        val imp_count_newUser = sc.sql(
           s"""
              |select '${stat_date}' as stat_date, count(cid_id) as get_imp_count
-             |from data_feed_exposure je inner join device_id_tmp1
-             |on je.device_id = device_id_tmp1.decive_id_oldUser
+             |from data_feed_exposure je inner join device_id_newUser
+             |on je.device_id = device_id_newUser.decive_id_newUser
              |where je.cid_type = 'diary'
              |and je.device_id regexp'${strategy}'
              |and je.device_id not in (select device_id from bl_device_list)
@@ -90,7 +128,9 @@ object strategy_clk_imp_oldUser {
          """.stripMargin
         )
 
-        val result = clk_count.join(imp_count,"stat_date")
+        val result = clk_count_oldUser.join(imp_count_oldUser,"stat_date")
+          .join(clk_count_newUser,"stat_date")
+          .join(imp_count_newUser,"stat_date")
         result.show()