|
|
@@ -2,6 +2,7 @@ import configparser
|
|
|
import glob
|
|
|
import os
|
|
|
import random
|
|
|
+import re
|
|
|
import subprocess
|
|
|
import sys
|
|
|
import time
|
|
|
@@ -152,7 +153,7 @@ class AgcVidoe():
|
|
|
def get_link_zw_count(cls, mark, platform):
|
|
|
current_time = datetime.now()
|
|
|
formatted_time = current_time.strftime("%Y-%m-%d")
|
|
|
- count = f"""SELECT COUNT(*) AS total_count FROM ( SELECT audio, account_id FROM agc_video_deposit WHERE time = '{formatted_time}' AND platform != '{platform}' and mark = '{mark}' GROUP BY audio, account_id) AS subquery;"""
|
|
|
+ count = f"""SELECT COUNT(*) AS total_count FROM ( SELECT audio, account_id FROM agc_video_deposit WHERE time = '{formatted_time}' and mark = '{mark}' GROUP BY audio, account_id) AS subquery;"""
|
|
|
count = MysqlHelper.get_values(count, "prod")
|
|
|
if count == None:
|
|
|
count = 0
|
|
|
@@ -563,7 +564,8 @@ class AgcVidoe():
|
|
|
zd_count = ex_list["zd_count"] # 生成总条数
|
|
|
|
|
|
# 总条数
|
|
|
- all_count = cls.get_link_gs_count(mark)
|
|
|
+ result = re.match(r'([^0-9]+)', mark).group()
|
|
|
+ all_count = cls.get_link_gs_count(result)
|
|
|
if all_count >= int(zd_count):
|
|
|
Feishu.bot('recommend', 'AGC完成通知', '今日脚本跟随视频拼接任务完成啦～', mark.split("-")[0], mark_name)
|
|
|
return mark
|
