Merge branch 'master' of git.wanmeizhensuo.com:ML/ffm-baseline

增加日记二级标签特征

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

@@ -51,8 +51,8 @@ object data_feed_exposure_precise {
       ti.tidbMapTable(dbName = "jerry_prod", tableName = "merge_queue_table")
 
 
-      val stat_date = GmeiConfig.getMinusNDate(1)
-//      val stat_date = param.date
+//      val stat_date = GmeiConfig.getMinusNDate(1)
+      val stat_date = param.date
       //println(param.date)
       val partition_date = stat_date.replace("-","")
 

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

@@ -51,8 +51,8 @@ object find_bug {
       ti.tidbMapTable(dbName = "jerry_prod", tableName = "merge_queue_table")
 
 
-      val stat_date = GmeiConfig.getMinusNDate(1)
-//      val stat_date = param.date
+//      val stat_date = GmeiConfig.getMinusNDate(1)
+      val stat_date = param.date
       //println(param.date)
       val partition_date = stat_date.replace("-","")
       val decive_id_oldUser = sc.sql(
@@ -346,8 +346,8 @@ object CTR_precise {
       ti.tidbMapTable(dbName = "jerry_prod", tableName = "merge_queue_table")
 
 
-      val stat_date = GmeiConfig.getMinusNDate(1)
-//      val stat_date = param.date
+//      val stat_date = GmeiConfig.getMinusNDate(1)
+      val stat_date = param.date
       //println(param.date)
       val partition_date = stat_date.replace("-","")
       val decive_id_oldUser = sc.sql(

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

@@ -420,6 +420,8 @@ object Repeated_content_recommendation_moreday {
 
 
       val now= new Date()
+//      val stat_date=param.date
+
       val dateFormat = new SimpleDateFormat("yyyy-MM-dd")
       val date = dateFormat.format(now.getTime - 86400000L * 8)
       val yesterday=dateFormat.format(now.getTime- 86400000L)