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

change pre days from 5 to 1

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

@@ -65,7 +65,9 @@ object testt {
 //      )
 ////      agency_id.show()
 //      agency_id.createOrReplaceTempView("agency_id")
-      val a = Array("message_home","my_favor","my_order","order_detail","organization_detail","other_homepage")
+      val a = Array("personal_store_diary_list","question_detail","received_votes","search_result","search_result_diary","search_result_more"
+,"search_result_welfare","service_all_cases_service_comment","spell_special_list","topic_detail","welfare_detail","welfare_list","welfare_special","wiki_detail"
+,"zone_detail","zone_v3")
       for (i <- 0 until a.length){
         val diary_pv = sc.sql(
           s"""
@@ -79,6 +81,7 @@ object testt {
              |order by partition_date
            """.stripMargin
         )
+        println("该来源的数据为："+ a(i))
         diary_pv.show()
       }