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

修改测试文件

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

@@ -638,8 +638,8 @@ object alpha_ctr {
 
       val device_num_count = sc.sql(
         s"""
-           |select '${stat_date}' as stat_date,count(DISTINCT(device_id))
-           |from ML_ALPHA_C_CT_DV_DEVICE_DIMEN_D
+           |select '${stat_date}' as stat_date,count(DISTINCT(device_id)) as device_num
+           |from ml.ML_ALPHA_C_CT_DV_DEVICE_DIMEN_D
            |where partition_day='${partition_date}'
            |and is_today_active="1"
        """.stripMargin
@@ -648,8 +648,8 @@ object alpha_ctr {
 
       val duration_device=sc.sql(
         s"""
-           |select '${stat_date}' as stat_date,sum(user_duration)/count(DISTINCT(device_id))
-           |from ML_ALPHA_C_CT_DV_DEVICE_INDIC_INC_D
+           |select '${stat_date}' as stat_date,sum(user_duration)/count(DISTINCT(device_id)) as device_duration
+           |from ml.ML_ALPHA_C_CT_DV_DEVICE_INDIC_INC_D
            |WHERE partition_day='${partition_date}'
            |and open_times!="0"
        """.stripMargin