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

add device read

eda/esmm/Model_pipline/submit.sh

 #! /bin/bash
+
+cd /srv/apps/ffm-baseline/eda/esmm
+git checkout master
 PYTHON_PATH=/home/gaoyazhe/miniconda3/bin/python
 MODEL_PATH=/srv/apps/ffm-baseline/eda/esmm
 DATA_PATH=/home/gmuser/esmm_data

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

@@ -52,8 +52,8 @@ object Recommendation_strategy_all {
       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(
@@ -201,7 +201,7 @@ object Recommendation_strategy_all {
           .join(device_num_hit,"stat_date")
       result1.show()
 
-//      GmeiConfig.writeToJDBCTable(result1, "Recommendation_strategy_temp", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable(result1, "Recommendation_strategy_temp", SaveMode.Append)
 
 
       //device_id尾号1有点击用户日记本点击数
@@ -298,7 +298,7 @@ object Recommendation_strategy_all {
         .join(device_all_cover,"stat_date")
       result2.show()
 
-//      GmeiConfig.writeToJDBCTable(result2, "strategy_other", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable(result2, "strategy_other", SaveMode.Append)
 
 
 //统计新用户点击率
@@ -371,7 +371,7 @@ object Recommendation_strategy_all {
         .join(imp_count_newUser_all,"stat_date")
       result3.show()
 
-//      GmeiConfig.writeToJDBCTable(result3, "Recommendation_strategy_newUser", SaveMode.Append)
+      GmeiConfig.writeToJDBCTable(result3, "Recommendation_strategy_newUser", SaveMode.Append)
 
     }