crv feature file changed

tensnsorflow/crv_feature.py

@@ -10,16 +10,23 @@ def get_data():
     ctx = SQLContext(sc)
     # end_date = (datetime.date.today() - datetime.timedelta(days=1)).strftime("%Y-%m-%d")
     # start_date = (datetime.date.today() - datetime.timedelta(days=day)).strftime("%Y-%m-%d")
-    dbtable = "(select device_id,stat_date,ucity_id,cid_id,diary_service_id,y,z,clevel1_id," \
-              "slevel1_id,ccity_name,scity_id from jerry_prod.esmm_data" \
-              "inner join eagle.home_tab_click " \
-              "on jerry_prod.esmm_data.device_id = eagle.home_tab_click.device_id)temp"
-    click = ctx.read.format("jdbc").options(url="jdbc:mysql://10.66.157.22:4000",
+    dbtable = "(select * from esmm_data)temp"
+    esmm_data = ctx.read.format("jdbc").options(url="jdbc:mysql://10.66.157.22:4000/jerry_prod",
                                              driver="com.mysql.jdbc.Driver",
                                              dbtable=dbtable,
                                              user="root",
                                              password="3SYz54LS9#^9sBvC").load()
-    click.show(6)
+    esmm_data.show(6)
+    dbtable = "(select * from home_tab_click)temp"
+    tab_click = ctx.read.format("jdbc").options(url="jdbc:mysql://10.66.157.22:4000/eagle",
+                                                driver="com.mysql.jdbc.Driver",
+                                                dbtable=dbtable,
+                                                user="root",
+                                                password="3SYz54LS9#^9sBvC").load()
+    tab_click.show(6)
+    esmm_data = esmm_data.join(tab_click,esmm_data.device_id == tab_click.device_id,"left")
+    esmm_data.show(6)
+