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

修改测试文件

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

@@ -624,7 +624,7 @@ object alpha_ctr {
            |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"
+           |and is_today_active='true'
        """.stripMargin
       )
       device_num_count.show()
@@ -643,14 +643,6 @@ object alpha_ctr {
 //      GmeiConfig.writeToJDBCTable(result3, "alpha_duration", SaveMode.Append)
       GmeiConfig.writeToJDBCTable("jdbc:mysql://172.16.40.158:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result3, table="alpha_duration",SaveMode.Append)
       println("写入完成")
-//      println("开始写入")
-//      GmeiConfig.writeToJDBCTable("jerry.jdbcuri",result3, table="alpha_duration",SaveMode.Append)
-//      println("写入完成")
-
-      //      GmeiConfig.writeToJDBCTable(result3, "alpha_duration", SaveMode.Append)
-//      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result3, table="alpha_duration",SaveMode.Append)
-
-
 
     }