调试

common/material.py

@@ -122,8 +122,6 @@ class Material():
                 sub_parts = part.split('--')
                 zn_result.append(sub_parts)
             zn_link = zn_result[0][0]  # 脚本链接
-            douyin = ''
-            kuaishou = ''
             if sheet:
                 parts = sheet.split(',')
                 result = []
@@ -132,17 +130,17 @@ class Material():
                     result.append(sub_parts)
                 douyin = result[0]
                 kuaishou = result[1]
-            if type == "douyin":
-                number = {"mark": mark, "feishu_id": feishu_id, "channel": douyin, "token": token,
-                          "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, "sheet": '1'}
-                list.append(number)
+                if type == "douyin":
+                    number = {"mark": mark, "feishu_id": feishu_id, "channel": douyin, "token": token,
+                              "mark_name": mark_name}
+                    list.append(number)
+                elif type == "kuaishou":
+                    number = {"mark": mark, "feishu_id": feishu_id, "channel": kuaishou, "token": token,
+                              "mark_name": mark_name}
+                    list.append(number)
             elif type == "zhannei":
                 number = {"mark": mark, "feishu_id": feishu_id, "channel": zn_link, "token": token,
-                          "mark_name": mark_name, "sheet": None}
+                          "mark_name": mark_name}
                 list.append(number)
         return list
 

data_assign_main.py

@@ -28,9 +28,8 @@ 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 valid_data]
+        futures = [executor.submit(zhannei_start, user_data) for user_data in data]
         # 等待所有任务执行完成
         for future in concurrent.futures.as_completed(futures):
             # 获取每个任务的执行结果
@@ -43,9 +42,8 @@ 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 valid_data]
+        futures = [executor.submit(kuaishou_start, user_data) for user_data in data]
         # 等待所有任务执行完成
         for future in concurrent.futures.as_completed(futures):
             # 获取每个任务的执行结果
@@ -53,14 +51,12 @@ def douyin_task():
             print("处理结果:", result)
     print("抖音数据抓取定时任务执行完成")
 
-
 # 定义定时任务
 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 valid_data]
+        futures = [executor.submit(kuaishou_start, user_data) for user_data in data]
         # 等待所有任务执行完成
         for future in concurrent.futures.as_completed(futures):
             # 获取每个任务的执行结果
@@ -69,8 +65,8 @@ def kuanshou_task():
     print("快手数据抓取定时任务执行完成.")
 
 
-schedule.every().day.at("19:00").do(kuanshou_task)
-schedule.every().day.at("19:00").do(douyin_task)
+schedule.every().day.at("19:05").do(kuanshou_task)
+schedule.every().day.at("19:05").do(douyin_task)
 schedule.every().day.at("18:00").do(zhannei_task)