Merge branch 'wzw' into 'master'

change

See merge request !9

eda/gray_stat/ffm_ctr.py

@@ -18,11 +18,11 @@ def get_yesterday_date():
     #today = datetime.date.today().strftime("%Y%m%d")
     #return today
 
-date = get_yesterday_date()
+
 def get_data():
     conn2db = pymysql.connect(host='10.66.157.22', port=4000, user='root', passwd='3SYz54LS9#^9sBvC', db='eagle')
     cursor = conn2db.cursor()
-    sql = "select device_id from eagle.ffm_diary_queue_temp where device_id regexp '[5|6]$'"
+    sql = "select device_id from eagle.ffm_diary_queue where device_id regexp '[5|6]$'"
     cursor.execute(sql)
     result = cursor.fetchall()
     device_id = tuple(pd.DataFrame(list(result))[0].values.tolist())
@@ -50,7 +50,6 @@ def ctr(date):
         print("点击率："+str(click/exp))
 
     return click,exp,click/exp
-temp_data = ctr(date)
 
 def rate2file():
     output_path = DIRECTORY_PATH + "ffm_ctr.csv"
@@ -60,4 +59,6 @@ def rate2file():
 
 if __name__ == "__main__":
     #ctr(date)
+    temp_data = ctr(date)
+    date = get_yesterday_date()
     rate2file()