zhangyong 1 ano atrás
pai
commit
76701ec3dd
2 arquivos alterados com 36 adições e 33 exclusões
  1. 33 33
      agc_assign_main.py
  2. 3 0
      video_agc/agc_video_method.py

+ 33 - 33
agc_assign_main.py

@@ -27,38 +27,38 @@ def video_start(user_data):
             Common.logger("video").info(f"返回用户名{mark}")
             returned_usernames_today.append(mark)
 
-# gs_name_list = Material.feishu_gs_list()
-# video_start(gs_name_list[0])
+gs_name_list = Material.feishu_gs_list()
+video_start(gs_name_list[0])
 
 
-def clear_returned_usernames():
-    returned_usernames_today.clear()
-    print("returned_usernames_today 已清空")
-
-# 定义定时任务
-def video_task():
-    print("开始执行生成视频脚.")
-    data = Material.feishu_gs_list()
-    # 创建一个线程池
-    with concurrent.futures.ThreadPoolExecutor() as executor:
-        futures = [executor.submit(video_start, user_data) for user_data in data]
-        # 等待所有任务执行完成
-        for future in concurrent.futures.as_completed(futures):
-            try:
-                # 获取每个任务的执行结果
-                result = future.result()
-                print("处理结果:", result)
-            except Exception as e:
-                print("处理任务时出现异常:", e)
-    print("执行生成视频脚结束")
-
-# 每天0点10清空集合
-schedule.every().day.at("00:05").do(clear_returned_usernames)
-
-#每10分钟执行次脚本
-schedule.every(10).minutes.do(video_task)
-
-
-while True:
-    schedule.run_pending()
-    time.sleep(1)
+# def clear_returned_usernames():
+#     returned_usernames_today.clear()
+#     print("returned_usernames_today 已清空")
+#
+# # 定义定时任务
+# def video_task():
+#     print("开始执行生成视频脚.")
+#     data = Material.feishu_gs_list()
+#     # 创建一个线程池
+#     with concurrent.futures.ThreadPoolExecutor() as executor:
+#         futures = [executor.submit(video_start, user_data) for user_data in data]
+#         # 等待所有任务执行完成
+#         for future in concurrent.futures.as_completed(futures):
+#             try:
+#                 # 获取每个任务的执行结果
+#                 result = future.result()
+#                 print("处理结果:", result)
+#             except Exception as e:
+#                 print("处理任务时出现异常:", e)
+#     print("执行生成视频脚结束")
+#
+# # 每天0点10清空集合
+# schedule.every().day.at("00:05").do(clear_returned_usernames)
+#
+# #每10分钟执行次脚本
+# schedule.every(10).minutes.do(video_task)
+#
+#
+# while True:
+#     schedule.run_pending()
+#     time.sleep(1)

+ 3 - 0
video_agc/agc_video_method.py

@@ -46,6 +46,8 @@ class AgcVidoe():
                                                         WHERE a.oss_object_key = b.oss_object_key AND b.time >= '{formatted_three_days_ago}' AND b.time <= '{formatted_current_time}'
                                                     ) AND a.account_id = '{user}' and a.`status` = 1 and a.mark = '{mark}' limit {limit_count};"""
                 url_list = MysqlHelper.get_values(url_list, "prod")
+                Common.logger("gs_video").info(f"{mark}查询数据{url_list} ")
+                Common.logger("gs_video").info(f"{mark}sql{url_list} ")
                 if url_list:
                     if len(url_list) >= 30:
                         return url_list
@@ -568,6 +570,7 @@ class AgcVidoe():
             if zw_count >= int(count):
                 return video_call
             limit_count = 1
+        Common.logger("gs_video").info(f"{mark}的{platform} 开始查询")
         url_list = cls.get_url_gs_list(video_list, mark, limit_count)
         if url_list == None:
             Common.logger("gs_video").info(f"{mark}的{platform} 渠道 视频画面不足无法拼接")