| 
					
				 | 
			
			
				@@ -47,19 +47,19 @@ def job_video_stitching(): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         video_type = "口播--美文类" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         channel_type = "koubo" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         VideoStitching.video_stitching(video_type, koubo_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, ksdouyin_account_id, channel_type) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    count = int(dy_yinmei_count + koubo_count + ks_yinmei_count + pjdouyin_account_id + ksdouyin_account_id) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    # 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, ksdouyin_account_id, channel_type) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    count = int(dy_yinmei_count + koubo_count + ks_yinmei_count) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     Common.logger("video").info(f"视频生成条数为:{count}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    if count == 40: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if count == 30: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if flag: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Feishu.bot('recommend', '拼接视频', '自制视频拼接完成啦,共计40条~') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             flag = False 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -74,9 +74,9 @@ def job_feishu_bot(): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # chunjie_zizhi_count = sql.get_chunjie_zizhi_account_id() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     pjdouyin_account_id = sql.get_pjdouyin_account_id() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     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}条') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    count = int(dy_yinmei_count + koubo_count + ks_yinmei_count) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if count < 30: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Feishu.bot('recommend', '拼接视频', f'视频生成异常,不符合预期,请检查\n目前生成数量如下:\n抖音-拼接类:{dy_yinmei_count}条 \n快手-拼接类:{ks_yinmei_count}条\n口播-拼接类:{koubo_count}条') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 # 每15分钟执行一次 
			 |