迁移到腾讯

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

@@ -638,17 +638,14 @@ object alpha_ctr {
 
 
 
-<<<<<<< HEAD
 //      GmeiConfig.writeToJDBCTable(result, "alpha_ctr", SaveMode.Append)
 //      GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result, table="alpha_ctr",SaveMode.Append)
 
       println("开始写入")
       GmeiConfig.writeToJDBCTable("jerry.jdbcuri",result, table="alpha_ctr",SaveMode.Append)
       println("写入完成")
-=======
       //      GmeiConfig.writeToJDBCTable(result, "alpha_ctr", SaveMode.Append)
       GmeiConfig.writeToJDBCTable("jdbc:mysql://152.136.44.138:4000/jerry_prod?user=root&password=3SYz54LS9#^9sBvC&rewriteBatchedStatements=true",result, table="alpha_ctr",SaveMode.Append)
->>>>>>> 6bb8533b68efef7c647251ef08479560d5e1216a
 
 
 
@@ -672,17 +669,16 @@ object alpha_ctr {
       )
 
       val result3=device_num_count.join(duration_device,"stat_date")
-<<<<<<< HEAD
+
 //      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)
 
       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)
->>>>>>> 6bb8533b68efef7c647251ef08479560d5e1216a