change sql for test

diaryQueueUpdate.py

@@ -50,9 +50,10 @@ def test_con_sql(device_id):
         print(nearby_queue[:5])
         print(nation_queue[:5])
         print(megacity_queue[:5])
-        return native_queue, nearby_queue, nation_queue, megacity_queue
+        return True,native_queue, nearby_queue, nation_queue, megacity_queue
     else:
         print("该用户对应的日记队列为空")
+        return False,[],[],[],[]
 
 
  # 更新前获取最新的native_queue
@@ -180,7 +181,8 @@ def update_dairy_queue(score_df):
         i = 1
         for j in video_id:
             diary_id.insert(i, j)
-            i += 5
+            # TODO 下面的3是测试用的，如果上线后，把3改成5
+            i += 3
 
 
         return diary_id
@@ -216,14 +218,15 @@ def multi_update(key, name_dict,native_queue_list):
 
 
 def user_update(device_id):
-    native_queue_list, nearby_queue_list, nation_queue_list, megacity_queue_list = test_con_sql(device_id)
-    name_dict = {"native_queue": native_queue_list, "nearby_queue": nearby_queue_list,
-                 "nation_queue": nation_queue_list, "megacity_queue": megacity_queue_list}
-    pool = Pool(4)
-    for key in name_dict.keys():
-        pool.apply_async(multi_update, (key, name_dict,native_queue_list,))
-    pool.close()
-    pool.join()
+    not_empty,native_queue_list, nearby_queue_list, nation_queue_list, megacity_queue_list = test_con_sql(device_id)
+    if not_empty:
+        name_dict = {"native_queue": native_queue_list, "nearby_queue": nearby_queue_list,
+                     "nation_queue": nation_queue_list, "megacity_queue": megacity_queue_list}
+        pool = Pool(4)
+        for key in name_dict.keys():
+            pool.apply_async(multi_update, (key, name_dict,native_queue_list,))
+        pool.close()
+        pool.join()
 
 if __name__ == "__main__":
     # while True:
@@ -242,6 +245,8 @@ if __name__ == "__main__":
         start = time.time()
         warnings.filterwarnings("ignore")
         data_set_cid = pd.read_csv(DIRECTORY_PATH + "data_set_cid.csv")["cid"].values.tolist()
+        print("predictlist")
+        print(predict_list[:6])
         if predict_list != []:
             for device_id in predict_list:
                 user_update(device_id)

userProfile.py

@@ -7,7 +7,7 @@ def get_active_users():
     now = datetime.now()
     now_start = str(now)[:16] + ":00"
     now_end = str(now)[:16] + ":59"
-    sql = "select device_id from user_active_time order by active_time desc limit 50;"
+    sql = "select device_id from user_active_time order by active_time desc limit 5;"
     # sql = "select device_id from user_active_time " \
     #       "where active_time <= '{}' and active_time >= '{}'".format(now_end,now_start)
     device_id_df = con_sql(sql)