bug fix

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

@@ -66,7 +66,7 @@ object strategy_clk_imp_oldUser {
         s"""
            |select distinct(device_id) as decive_id
            |from online.ml_device_day_active_status
-           |where (active_type = '1' or active_type = '2' or active_type = '3')
+           |where active_type != '4'
            |and partition_date ='${partition_date}'
          """.stripMargin
       )
@@ -78,26 +78,28 @@ object strategy_clk_imp_oldUser {
         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
+             |from data_feed_click jd left outer 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 ='${stat_date}'
+             |and device_id_old.decive_id is null
          """.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
+             |from data_feed_exposure je left outer 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 ='${stat_date}'
+             |and device_id_old.decive_id is null
          """.stripMargin
         )
 
@@ -105,26 +107,28 @@ object strategy_clk_imp_oldUser {
         val clk_count_newUser = sc.sql(
           s"""
              |select '${stat_date}' as stat_date, count(cid_id) as get_clk_count_newUser
-             |from data_feed_click jd inner join device_id_newUser
+             |from data_feed_click jd left outer join device_id_newUser
              |on jd.device_id = device_id_newUser.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 ='${stat_date}'
+             |and device_id_newUser.decive_id is null
          """.stripMargin
         )
 
         val imp_count_newUser = sc.sql(
           s"""
              |select '${stat_date}' as stat_date, count(cid_id) as get_imp_count_newUser
-             |from data_feed_exposure je inner join device_id_newUser
+             |from data_feed_exposure je left outer join device_id_newUser
              |on je.device_id = device_id_newUser.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 ='${stat_date}'
+             |and device_id_newUser.decive_id is null
          """.stripMargin
         )