调试

common/sql_help.py

@@ -26,15 +26,15 @@ class sqlCollect():
     判断该任务id是否用过
     """
     @classmethod
-    def is_used(cls, task_mark, video_id, mark_name, channel):
+    def is_used(cls, video_id, mark_name, channel):
         sql = """
             SELECT used_video_id
             FROM pj_video_data
-            WHERE used_video_id = %s AND task_name = %s AND mark_name = %s AND channel = %s 
+            WHERE used_video_id = %s AND mark_name = %s AND channel = %s 
             ORDER BY data_time DESC
             LIMIT 1
         """
-        data = MysqlHelper.get_values(sql, (str(video_id), task_mark, mark_name, channel))
+        data = MysqlHelper.get_values(sql, (str(video_id), mark_name, channel))
         if len(data) == 0 or data == ():
             return False
         return True
@@ -43,15 +43,15 @@ class sqlCollect():
     根据时间判断该任务id是否用过
     """
     @classmethod
-    def is_used_days(cls, task_mark, video_id, mark_name, channel, day_count):
+    def is_used_days(cls, video_id, mark_name, channel, day_count):
         sql = """
                 SELECT used_video_id
                 FROM pj_video_data
-                WHERE used_video_id = %s AND task_name = %s AND mark_name = %s AND channel = %s 
+                WHERE used_video_id = %s AND mark_name = %s AND channel = %s 
                 ORDER BY data_time DESC
                 LIMIT 1 AND create_time >= DATE_SUB(NOW(), INTERVAL %s DAY)
             """
-        data = MysqlHelper.get_values(sql, (str(video_id), task_mark, mark_name, channel,int(day_count)))
+        data = MysqlHelper.get_values(sql, (str(video_id), mark_name, channel,int(day_count)))
         if len(data) == 0 or data == ():
             return False
         return True

data_channel/douyin.py

@@ -70,9 +70,9 @@ class DY:
                         video_id = data[i].get('aweme_id')  # 文章id
                         day_count = Material.get_count_restrict(channel_id)
                         if day_count:
-                            status =sqlCollect.is_used_days(task_mark, video_id, mark, channel_id,day_count)
+                            status =sqlCollect.is_used_days(video_id, mark, channel_id,day_count)
                         else:
-                            status = sqlCollect.is_used(task_mark, video_id, mark, channel_id)
+                            status = sqlCollect.is_used(video_id, mark, channel_id)
 
                         video_uri = data[i].get('video', {}).get('play_addr', {}).get('uri')
                         ratio = f'{data[i].get("video", {}).get("height")}p'

data_channel/dy_keyword.py

@@ -58,9 +58,9 @@ class DyKeyword:
                 video_id = data[i].get('aweme_id')  # 文章id
                 day_count = Material.get_count_restrict(channel_id)
                 if day_count:
-                    status = sqlCollect.is_used_days(task_mark, video_id, mark, channel_id, day_count)
+                    status = sqlCollect.is_used_days(video_id, mark, channel_id, day_count)
                 else:
-                    status = sqlCollect.is_used(task_mark, video_id, mark, channel_id)
+                    status = sqlCollect.is_used(video_id, mark, channel_id)
                 video_uri = data[i].get('video', {}).get('play_addr', {}).get('uri')
                 ratio = f'{data[i].get("video", {}).get("height")}p'
                 # video_url = f'https://www.iesdouyin.com/aweme/v1/play/?video_id={video_uri}&ratio={ratio}&line=0'  # 视频链接

data_channel/dy_ls.py

@@ -43,9 +43,9 @@ class DYLS:
                     # if status:
                     day_count = Material.get_count_restrict(channel_id)
                     if day_count:
-                        status = sqlCollect.is_used_days(task_mark, video_id, mark, "抖音历史", day_count)
+                        status = sqlCollect.is_used_days(video_id, mark, "抖音历史", day_count)
                     else:
-                        status = sqlCollect.is_used(task_mark, video_id, mark, "抖音历史")
+                        status = sqlCollect.is_used(video_id, mark, "抖音历史")
 
                     video_uri = data[i].get('video', {}).get('play_addr', {}).get('uri')
                     ratio = f'{data[i].get("video", {}).get("height")}p'

data_channel/ks_keyword.py

@@ -68,9 +68,9 @@ class KsKeyword:
                 photo_id =  data['photo_id']
                 day_count = Material.get_count_restrict(channel_id)
                 if day_count:
-                    status = sqlCollect.is_used_days(task_mark, photo_id, mark, channel_id, day_count)
+                    status = sqlCollect.is_used_days(photo_id, mark, channel_id, day_count)
                 else:
-                    status = sqlCollect.is_used(task_mark, photo_id, mark, channel_id)
+                    status = sqlCollect.is_used(photo_id, mark, channel_id)
 
                 image_url = data['cover_thumbnail_urls'][0]['url']
                 video_url = data['main_mv_urls'][0]['url']

data_channel/ks_ls.py

@@ -46,10 +46,10 @@ class KSLS:
                     photo_id = data["photo_id"]
                     day_count = Material.get_count_restrict(channel_id)
                     if day_count:
-                        status = sqlCollect.is_used_days(task_mark, photo_id, mark, "快手历史", day_count)
+                        status = sqlCollect.is_used_days(photo_id, mark, "快手历史", day_count)
                     else:
 
-                        status = sqlCollect.is_used(task_mark, photo_id, mark, "快手历史")
+                        status = sqlCollect.is_used(photo_id, mark, "快手历史")
 
                     view_count = data["view_count"]
                     share_count = data["share_count"]

data_channel/ks_xcx_keyword.py

@@ -75,9 +75,9 @@ class KsXCXKeyword:
                 photo_id =  data['photoId']
                 day_count = Material.get_count_restrict(channel_id)
                 if day_count:
-                    status = sqlCollect.is_used_days(task_mark, photo_id, mark, channel_id, day_count)
+                    status = sqlCollect.is_used_days(photo_id, mark, channel_id, day_count)
                 else:
-                    status = sqlCollect.is_used(task_mark, photo_id, mark, channel_id)
+                    status = sqlCollect.is_used(photo_id, mark, channel_id)
 
                 image_url = data['webpCoverUrls'][0]['url']
                 video_url = data['mainMvUrls'][0]['url']

data_channel/kuaishou.py

@@ -119,9 +119,9 @@ class KS:
                     video_id = feeds[i].get("photo", {}).get("id", "")
                     day_count = Material.get_count_restrict(channel_id)
                     if day_count:
-                        status = sqlCollect.is_used_days(task_mark, video_id, mark, channel_id, day_count)
+                        status = sqlCollect.is_used_days(video_id, mark, channel_id, day_count)
                     else:
-                        status = sqlCollect.is_used(task_mark, video_id, mark, channel_id)
+                        status = sqlCollect.is_used(video_id, mark, channel_id)
 
                     old_title = feeds[i].get("photo", {}).get("caption")
                     cover_url = feeds[i].get('photo', {}).get('coverUrl', "")

data_channel/piaoquan.py

@@ -119,7 +119,7 @@ class PQ:
 
             for url in content:
                 video_id = url["id"]
-                status = sqlCollect.is_used(task_mark, video_id, mark, "票圈")
+                status = sqlCollect.is_used(video_id, mark, "票圈")
 
                 cover = url["coverImgPath"]
                 video_url = url["transedVideoPath"]

data_channel/shipinhao.py

@@ -84,9 +84,9 @@ class SPH:
                         objectId = obj['id']
                         day_count = Material.get_count_restrict(channel_id)
                         if day_count:
-                            status = sqlCollect.is_used_days(task_mark, objectId, mark, "视频号", day_count)
+                            status = sqlCollect.is_used_days(objectId, mark, "视频号", day_count)
                         else:
-                            status = sqlCollect.is_used(task_mark, objectId, mark, "视频号")
+                            status = sqlCollect.is_used( objectId, mark, "视频号")
 
                         old_title = obj['objectDesc']['description']
                         url_p = obj['objectDesc']['media'][0]['Url']

data_channel/sph_keyword.py

@@ -59,9 +59,9 @@ class SphKeyword:
                 AliyunLogger.logging(channel_id, name, keyword, video_id, "扫描到一条视频", "2001", log_data)
                 day_count = Material.get_count_restrict(channel_id)
                 if day_count:
-                    status = sqlCollect.is_used_days(task_mark, video_id, mark, channel_id, day_count)
+                    status = sqlCollect.is_used_days(video_id, mark, channel_id, day_count)
                 else:
-                    status = sqlCollect.is_used(task_mark, video_id, mark, channel_id)
+                    status = sqlCollect.is_used(video_id, mark, channel_id)
                 if status:
                     AliyunLogger.logging(channel_id, name, keyword, video_id, "该视频已改造过", "2002", log_data)
                     continue

data_channel/sph_ls.py

@@ -13,9 +13,9 @@ class SPHLS:
                 video_id = data[0]
                 day_count = Material.get_count_restrict(channel_id)
                 if day_count:
-                    status = sqlCollect.is_used_days(task_mark, video_id, mark, "视频号历史", day_count)
+                    status = sqlCollect.is_used_days(video_id, mark, "视频号历史", day_count)
                 else:
-                    status = sqlCollect.is_used(task_mark,video_id, mark, "视频号历史")
+                    status = sqlCollect.is_used(video_id, mark, "视频号历史")
 
                 old_title = data[1]
                 share_cnt = int(data[2])