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

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

@@ -241,13 +241,14 @@ object EsmmPredData {
       ti.tidbMapTable(dbName = "jerry_prod",tableName = "data_feed_exposure")
 
 
-      val yesteday_have_seq = GmeiConfig.getMinusNDate(5)
+      val yesteday_have_seq = GmeiConfig.getMinusNDate(1)
       val activate_data = sc.sql(
         s"""
            |select a.device_id,a.city_id as ucity_id,explode(split(a.search_queue, ',')) as cid_id
            |from merge_queue_table a
            |left join data_feed_exposure b on a.device_id=b.device_id and a.city_id=b.city_id
-           |where b.stat_date >'${yesteday_have_seq}'
+           |where b.stat_date ='${yesteday_have_seq}'
+           |and b.device_id is not null
          """.stripMargin
       )