update dairyQueueUpdate file

diaryQueueUpdate.py

@@ -225,33 +225,35 @@ def pipe_line(queue_name, queue_arg, device_id):
         return diary_queue
 
 
+def wrapper_func(queue_list,queue_name,device_id,city_id,data_set_cid,megacity_queue_list):
+    if queue_list:
+        queue_predict = list(set(queue_list) & set(data_set_cid))
+        queue_not_predict = list(set(queue_list) - set(data_set_cid))
+        queue_arg = [queue_predict, queue_not_predict, queue_list]
+        if queue_predict != []:
+            diary_queue = pipe_line(queue_name, queue_arg, device_id)
+            if diary_queue and (megacity_queue_list == get_megacity_queue(device_id, city_id)):
+                update_sql_dairy_queue(queue_name, diary_queue, device_id, city_id)
+                print("更新结束")
+            else:
+                print("日记队列已更新不需要更新日记队列，或者日记队列为空")
+        else:
+            print("预测集是空，不需要预测")
+
+
 def user_update(device_id,city_id,data_set_cid):
-    global megacity_queue_list
-    #TODO 测试成功后把下面的list还原
     queue_name_list = ["native_queue","nearby_queue","nation_queue","megacity_queue"]
     for queue_name in queue_name_list:
         queue_list = get_queue(device_id, city_id,queue_name)
         if queue_name == "megacity_queue":
             megacity_queue_list = queue_list
-        if queue_list:
-            queue_predict = list(set(queue_list) & set(data_set_cid))
-            queue_not_predict = list(set(queue_list) - set(data_set_cid))
-            queue_arg = [queue_predict,queue_not_predict,queue_list]
-            if queue_predict != []:
-                diary_queue = pipe_line(queue_name, queue_arg, device_id)
-
-                if diary_queue and (megacity_queue_list == get_megacity_queue(device_id, city_id)):
-                    update_sql_dairy_queue(queue_name, diary_queue, device_id, city_id)
-                    print("更新结束")
-                else:
-                    print("日记队列已更新不需要更新日记队列，或者日记队列为空")
-            else:
-                print("预测集是空，不需要预测")
+            wrapper_func(queue_list,queue_name,device_id,city_id,data_set_cid,megacity_queue_list)
         else:
             print("日记队列为空")
 
 
-def run(data_set_cid):
+def run():
+    data_set_cid = pd.read_csv(DIRECTORY_PATH + "data_set_cid.csv")["cid"].values.tolist()
     # TODO 如果测刘潇的没问题，去掉下面代码的注释
     # device_city_list = get_active_users()
     # TODO 先测一下高雅喆的，如果没问题，然后再测刘潇的
@@ -266,10 +268,9 @@ def run(data_set_cid):
 
 if __name__ == "__main__":
     warnings.filterwarnings("ignore")
-    data_set_cid = pd.read_csv(DIRECTORY_PATH + "data_set_cid.csv")["cid"].values.tolist()
     # todo 正式上线后把下面while True的代码加上
     # while True:
-    run(data_set_cid)
+    run()
 
 
 # # TODO 上线后把预测用户改成多进程预测