zhangyong 1 年之前
父節點
當前提交
24c6c83a01
共有 2 個文件被更改,包括 9 次插入6 次删除
  1. 3 3
      common/material.py
  2. 6 3
      data_assign_main.py

+ 3 - 3
common/material.py

@@ -132,15 +132,15 @@ class Material():
                 kuaishou = result[1]
                 if type == "douyin":
                     number = {"mark": mark, "feishu_id": feishu_id, "channel": douyin, "token": token,
-                              "mark_name": mark_name}
+                              "mark_name": mark_name, "sheet": "1"}
                     list.append(number)
                 elif type == "kuaishou":
                     number = {"mark": mark, "feishu_id": feishu_id, "channel": kuaishou, "token": token,
-                              "mark_name": mark_name}
+                              "mark_name": mark_name, "sheet": "1"}
                     list.append(number)
             elif type == "zhannei":
                 number = {"mark": mark, "feishu_id": feishu_id, "channel": zn_link, "token": token,
-                          "mark_name": mark_name}
+                          "mark_name": mark_name, "sheet": None}
                 list.append(number)
         return list
 

+ 6 - 3
data_assign_main.py

@@ -28,8 +28,9 @@ def zhannei_start(user_data):
 def zhannei_task():
     data = Material.get_all_gs_user("zhannei")
     # 创建一个线程池
+    valid_data = [user_data for user_data in data if user_data['sheet'] is None]
     with concurrent.futures.ThreadPoolExecutor() as executor:
-        futures = [executor.submit(zhannei_start, user_data) for user_data in data]
+        futures = [executor.submit(zhannei_start, user_data) for user_data in valid_data]
         # 等待所有任务执行完成
         for future in concurrent.futures.as_completed(futures):
             # 获取每个任务的执行结果
@@ -42,8 +43,9 @@ def zhannei_task():
 def douyin_task():
     data = Material.get_all_gs_user("douyin")
     # 创建一个线程池
+    valid_data = [user_data for user_data in data if user_data['sheet'] is not None]
     with concurrent.futures.ThreadPoolExecutor() as executor:
-        futures = [executor.submit(kuaishou_start, user_data) for user_data in data]
+        futures = [executor.submit(kuaishou_start, user_data) for user_data in valid_data]
         # 等待所有任务执行完成
         for future in concurrent.futures.as_completed(futures):
             # 获取每个任务的执行结果
@@ -55,8 +57,9 @@ def douyin_task():
 def kuanshou_task():
     data = Material.get_all_gs_user("kuaishou")
     # 创建一个线程池
+    valid_data = [user_data for user_data in data if user_data['sheet'] is not None]
     with concurrent.futures.ThreadPoolExecutor() as executor:
-        futures = [executor.submit(kuaishou_start, user_data) for user_data in data]
+        futures = [executor.submit(kuaishou_start, user_data) for user_data in valid_data]
         # 等待所有任务执行完成
         for future in concurrent.futures.as_completed(futures):
             # 获取每个任务的执行结果