zhangyong 1 rok temu
rodzic
commit
d224b66a42
1 zmienionych plików z 13 dodań i 13 usunięć
  1. 13 13
      main.py

+ 13 - 13
main.py

@@ -27,16 +27,6 @@ def job_video_stitching():
         video_type = "音画美文"
         channel_type = "kuaishou"
         VideoStitching.video_stitching(video_type, ks_yinmei_count, channel_type)
-    elif int(pjdouyin_account_id) < 5:
-        Common.logger("video").info("开始执行-抖音拼接")
-        video_type = "抖音-拼接类"
-        channel_type = "dypinjie"
-        VideoStitching.video_stitching_pinjie(video_type, pjdouyin_account_id, channel_type)
-    elif int(ksdouyin_account_id) < 5:
-        Common.logger("video").info("开始执行-快手拼接")
-        video_type = "快手-拼接类"
-        channel_type = "kspinjie"
-        VideoStitching.video_stitching_pinjie(video_type, pjdouyin_account_id, channel_type)
     elif int(dy_yinmei_count) < 10:
         Common.logger("video").info("开始执行-抖音")
         video_type = "音画美文"
@@ -51,13 +41,23 @@ def job_video_stitching():
     #     Common.logger("video").info("开始执行-口播-春节")
     #     video_type = "口播--美文类"
     #     channel_type = "jieri"
-        VideoStitching.video_stitching(video_type, koubo_count, channel_type)
+    #     VideoStitching.video_stitching(video_type, koubo_count, channel_type)
     elif int(koubo_count) < 10:
         Common.logger("video").info("开始执行-口播")
         video_type = "口播--美文类"
         channel_type = "koubo"
         VideoStitching.video_stitching(video_type, koubo_count, channel_type)
-    count = int(dy_yinmei_count + koubo_count + ks_yinmei_count)
+    elif int(pjdouyin_account_id) < 5:
+        Common.logger("video").info("开始执行-抖音拼接")
+        video_type = "抖音-拼接类"
+        channel_type = "dypinjie"
+        VideoStitching.video_stitching_pinjie(video_type, pjdouyin_account_id, channel_type)
+    elif int(ksdouyin_account_id) < 5:
+        Common.logger("video").info("开始执行-快手拼接")
+        video_type = "快手-拼接类"
+        channel_type = "kspinjie"
+        VideoStitching.video_stitching_pinjie(video_type, pjdouyin_account_id, channel_type)
+    count = int(dy_yinmei_count + koubo_count + ks_yinmei_count + pjdouyin_account_id + ksdouyin_account_id)
     Common.logger("video").info(f"视频生成条数为:{count}")
     if count == 40:
         if flag:
@@ -76,7 +76,7 @@ def job_feishu_bot():
     ksdouyin_account_id = sql.get_ksdouyin_account_id()
     count = int(dy_yinmei_count + koubo_count + ks_yinmei_count + pjdouyin_account_id + ksdouyin_account_id)
     if count < 40:
-        Feishu.bot('recommend', '拼接视频', f'视频生成异常,不符合预期,请检查\n目前生成数量如下:\n抖音-拼接类:{pjdouyin_account_id}条\n快手-拼接类:{ksdouyin_account_id}条\n抖音视频拼接:{dy_yinmei_count}条 \n快手视频拼接:{ks_yinmei_count}条\n口播视频拼接:{koubo_count}条')
+        Feishu.bot('recommend', '拼接视频', f'视频生成异常,不符合预期,请检查\n目前生成数量如下:\n抖音-纯拼接类:{pjdouyin_account_id}条\n快手-纯拼接类:{ksdouyin_account_id}条\n抖音-拼接类:{dy_yinmei_count}条 \n快手-拼接类:{ks_yinmei_count}条\n口播-拼接类:{koubo_count}条')
 
 
 # 每15分钟执行一次