new functino

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

@@ -13,7 +13,8 @@ object strategy_clk_imp_oldUser {
   Logger.getLogger("org.apache.spark").setLevel(Level.WARN)
   Logger.getLogger("org.apache.eclipse.jetty.server").setLevel(Level.OFF)
 
-  case class Params(env: String = "dev"
+  case class Params(env: String = "dev",
+                    date: String = "2018-08-01"
                    ) extends AbstractParams[Params] with Serializable
 
   val defaultParams = Params()
@@ -48,9 +49,9 @@ object strategy_clk_imp_oldUser {
 
 
       import sc.implicits._
-      val stat_date = GmeiConfig.getMinusNDate(1)
-      println(stat_date)
-      val partition_date = stat_date.replace("-","")
+//      val stat_date = GmeiConfig.getMinusNDate(1)
+      println(param.date)
+      val partition_date = param.date.replace("-","")
       val decive_id_oldUser = sc.sql(
         s"""
            |select distinct(device_id) as decive_id
@@ -77,54 +78,54 @@ object strategy_clk_imp_oldUser {
       for (strategy <- strategies){
         val clk_count_oldUser = sc.sql(
           s"""
-             |select '${stat_date}' as stat_date, count(cid_id) as get_clk_count_old
+             |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 ='${stat_date}'
+             |and jd.stat_date ='${param.date}'
          """.stripMargin
         )
 
         val imp_count_oldUser = sc.sql(
           s"""
-             |select '${stat_date}' as stat_date, count(cid_id) as get_imp_count_old
+             |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 ='${stat_date}'
+             |and je.stat_date ='${param.date}'
          """.stripMargin
         )
 
 
         val clk_count_newUser = sc.sql(
           s"""
-             |select '${stat_date}' as stat_date, count(cid_id) as get_clk_count_newUser
+             |select '${param.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
              |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 jd.stat_date ='${param.date}'
          """.stripMargin
         )
 
         val imp_count_newUser = sc.sql(
           s"""
-             |select '${stat_date}' as stat_date, count(cid_id) as get_imp_count_newUser
+             |select '${param.date}' as stat_date, count(cid_id) as get_imp_count_newUser
              |from data_feed_exposure je inner 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 je.stat_date ='${param.date}'
          """.stripMargin
         )
         imp_count_newUser.show()