Merge branch '2024-11-13-luojunhui-fix-spider' of Server/title_with_video into 2024-09-23newDbTasks

tasks/newContentIdTask.py

@@ -375,12 +375,16 @@ class NewContentIdTask(object):
         :return:
         """
         SPIDER_INIT_STATUS = 1
+        DOWNLOAD_SUCCESS_STATUS = 2
         trace_id = params['trace_id']
         content_id = params['content_id']
         process_times = params['process_times']
         gh_id = params['gh_id']
         select_sql = f"""
-        select count(id) from {self.article_crawler_video_table} where content_id = '{content_id}';
+        select count(id) 
+        from {self.article_crawler_video_table} 
+        where content_id = '{content_id}' 
+        and download_status = {DOWNLOAD_SUCCESS_STATUS};
         """
         count_tuple = await self.mysql_client.async_select(select_sql)
         counts = count_tuple[0][0]
@@ -450,6 +454,7 @@ class NewContentIdTask(object):
         ETL_TASK_INIT_STATUS = 2
         trace_id = params['trace_id']
         content_id = params['content_id']
+        process_times = params['process_times']
         # 判断是否有三条已经下载完成的视频
         select_sql = f"""
             select count(id) 
@@ -569,8 +574,8 @@ class NewContentIdTask(object):
                 return True
             else:
                 await self.roll_back_content_status_when_fails(
-                    process_times=params['process_times'] + 1,
-                    trace_id=params['trace_id']
+                    process_times=process_times + 1,
+                    trace_id=trace_id
                 )
                 return False