修改去重方式

common/feishu_form.py

@@ -64,24 +64,6 @@ class Material():
                 values = [channel_id, video_id_total, piaoquan_id, video_share, video_ending_total, crop_tool, gg_duration, title_total]
                 filtered_values = [str(value) for value in values if value is not None and value != "None"]
                 task_mark = "_".join(map(str, filtered_values))
-                if ls_number and ls_number not in {'None', ''}:
-                    if channel_id == "抖音":
-                        new_channel_id = "抖音历史"
-                    if channel_id == "快手":
-                        new_channel_id = "快手历史"
-                    number_dict = {
-                        "task_mark": task_mark,
-                        "channel_id": new_channel_id,
-                        "channel_url": channel_url,
-                        "piaoquan_id": piaoquan_id,
-                        "number": ls_number,
-                        "title": title,
-                        "video_share": video_share,
-                        "video_ending": video_ending,
-                        "crop_total": crop_tool,
-                        "gg_duration_total": gg_duration,
-                    }
-                    processed_list.append(number_dict)
                 if piaoquan_id and piaoquan_id not in {'None', ''}:
                     number_dict = {
                         "task_mark": task_mark,
@@ -96,6 +78,28 @@ class Material():
                         "gg_duration_total": gg_duration,
                     }
                     processed_list.append(number_dict)
+                    if ls_number and ls_number not in {'None', ''}:
+                        if channel_id == "抖音":
+                            new_channel_id = "抖音历史"
+                        if channel_id == "快手":
+                            new_channel_id = "快手历史"
+                        values = [new_channel_id, video_id_total, piaoquan_id, video_share, video_ending_total, crop_tool,
+                                  gg_duration, title_total]
+                        filtered_values = [str(value) for value in values if value is not None and value != "None"]
+                        task_mark = "_".join(map(str, filtered_values))
+                        number_dict = {
+                            "task_mark": task_mark,
+                            "channel_id": new_channel_id,
+                            "channel_url": channel_url,
+                            "piaoquan_id": piaoquan_id,
+                            "number": ls_number,
+                            "title": title,
+                            "video_share": video_share,
+                            "video_ending": video_ending,
+                            "crop_total": crop_tool,
+                            "gg_duration_total": gg_duration,
+                        }
+                        processed_list.append(number_dict)
 
                 else:
                     return processed_list

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 True
         return False

data_channel/douyin.py

@@ -62,7 +62,7 @@ class DY:
                 if entity_type == 4:
                     # is_top = data[i].get('is_top')  # 是否置顶
                     video_id = data[i].get('aweme_id')  # 文章id
-                    status = sqlCollect.is_used(task_mark, video_id, mark, channel_id)
+                    status = sqlCollect.is_used(video_id, mark, channel_id)
                     if status:
                         video_uri = data[i].get('video', {}).get('play_addr', {}).get('uri')
                         ratio = f'{data[i].get("video", {}).get("height")}p'

data_channel/dy_ls.py

@@ -43,9 +43,9 @@ class DYLS:
                     duration = data["duration"]
                     video_id = data["video_id"]
                     old_title = data["video_desc"]
-                    status = sqlCollect.is_used(task_mark, video_id, mark, "抖音")
+                    status = sqlCollect.is_used(video_id, mark, "抖音")
                     if status:
-                        status = sqlCollect.is_used(task_mark, video_id, mark, "抖音历史")
+                        status = sqlCollect.is_used(video_id, mark, "抖音历史")
                         if status == False:
                             continue
 

data_channel/dy_nrxs.py

@@ -0,0 +1,8 @@
+
+class DYNrxs:
+    """
+    抖音内容相似
+    """
+    @classmethod
+    def get_dy_nrxs(cls):
+        pass

data_channel/ks_ls.py

@@ -40,10 +40,10 @@ class KSLS:
                 data_list = data_all_list["data"]
                 for data in data_list:
                     photo_id = data["photo_id"]
-                    status = sqlCollect.is_used(task_mark, photo_id, mark, "快手")
+                    status = sqlCollect.is_used( photo_id, mark, "快手")
                     if status == False:
                         continue
-                    status = sqlCollect.is_used(task_mark, photo_id, mark, "快手历史")
+                    status = sqlCollect.is_used(photo_id, mark, "快手历史")
                     if status == False:
                         continue
                     view_count = data["view_count"]

data_channel/kuaishou.py

@@ -94,10 +94,10 @@ class KS:
                         video_id = feeds[i].get("photo", {}).get("videoResource").get("h264", {}).get("videoId", "")
                     except KeyError:
                         video_id = feeds[i].get("photo", {}).get("videoResource").get("hevc", {}).get("videoId", "")
-                    status = sqlCollect.is_used(task_mark, video_id, mark, channel_id)
+                    status = sqlCollect.is_used(video_id, mark, channel_id)
                     if status:
                         video_id = feeds[i].get("photo", {}).get("id", "")
-                        status = sqlCollect.is_used(task_mark, video_id, mark, channel_id)
+                        status = sqlCollect.is_used(video_id, mark, channel_id)
                         if status:
                             share_count = cls.get_share_count(video_id)
                             old_title = feeds[i].get("photo", {}).get("caption")

data_channel/piaoquan.py

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

data_channel/shipinhao.py

@@ -86,7 +86,7 @@ class SPH:
                     last_buffer = res_json.get('last_buffer')
                     for obj in res_json["UpMasterHomePage"]:
                         objectId = obj['objectId']
-                        status = sqlCollect.is_used(task_mark, objectId, mark, "视频号")
+                        status = sqlCollect.is_used(objectId, mark, "视频号")
                         if status:
                             objectNonceId = obj['objectNonceId']
                             url = "http://61.48.133.26:30001/GetFinderDownloadAddress"