change sql for test

diaryQueueUpdate.py

@@ -46,10 +46,10 @@ def test_con_sql(device_id):
 
         db.close()
         print("成功获取日记队列")
-        print(native_queue)
-        print(nearby_queue)
-        print(nation_queue)
-        print(megacity_queue)
+        print(native_queue[:5])
+        print(nearby_queue[:5])
+        print(nation_queue[:5])
+        print(megacity_queue[:5])
         return native_queue, nearby_queue, nation_queue, megacity_queue
     else:
         print("该用户对应的日记队列为空")
@@ -117,9 +117,7 @@ def predict(queue_name, x_list):
 
     ffm_model.predict(DIRECTORY_PATH + "model.out",
                       DIRECTORY_PATH + "result/output{0}_{1}.csv".format(device_id,queue_name))
-    # print("done predict")
-
-
+    return save_result(queue_name, x_list)
 
 
 def save_result(queue_name, x_list):
@@ -135,7 +133,7 @@ def save_result(queue_name, x_list):
     score_df["cid"] = x_list
 
 
-    return score_df
+    return merge_score(x_list, score_df)
 
 
 
@@ -151,16 +149,15 @@ def merge_score(x_list, score_df):
     cursor.execute(sql)
     result = cursor.fetchall()
     score = pd.DataFrame(list(result))
-    print("数据库日记表前十行")
-    # print(score)
+    # print("数据库日记表前十行")
+    # # print(score)
     score_list = score[0].values.tolist()
 
     db.close()
 
     score_df["score"] = score_df["score"] + score_list
-    print("sum")
-    # print(score_df)
-    return score_df
+
+    return update_dairy_queue(score_df)
 
 
 
@@ -208,10 +205,8 @@ def update_sql_dairy_queue(queue_name, diary_id):
 
 def multi_update(key, name_dict,native_queue_list):
     if name_dict[key] != []:
-        predict(key, name_dict[key])
-        score_df = save_result(key, name_dict[key])
-        score_df = merge_score(name_dict[key], score_df)
-        diary_id = update_dairy_queue(score_df)
+        diary_id = predict(key, name_dict[key])
+
 
         if get_native_queue(device_id) == native_queue_list:
             update_sql_dairy_queue(key, diary_id)
@@ -270,5 +265,9 @@ if __name__ == "__main__":
     #     multi_update(key, name_dict)
 
 
+# predict(key, name_dict[key])
+#         score_df = save_result(key, name_dict[key])
+#         score_df = merge_score(name_dict[key], score_df)
+#         diary_id = update_dairy_queue(score_df)