|
@@ -120,7 +120,7 @@ class CarryViode:
|
|
|
return None, None,None
|
|
return None, None,None
|
|
|
|
|
|
|
|
|
|
|
|
|
- def insert_pq(self, REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark):
|
|
|
|
|
|
|
+ def insert_pq(self, REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark, task_mark):
|
|
|
logger.info(f"[+] {REDIS_NAME}的{data}开始写入票圈")
|
|
logger.info(f"[+] {REDIS_NAME}的{data}开始写入票圈")
|
|
|
n_ids = str(data["pq_ids"])
|
|
n_ids = str(data["pq_ids"])
|
|
|
if ',' in n_ids:
|
|
if ',' in n_ids:
|
|
@@ -152,7 +152,7 @@ class CarryViode:
|
|
|
try:
|
|
try:
|
|
|
current_time = datetime.now()
|
|
current_time = datetime.now()
|
|
|
formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
|
|
formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
|
|
|
- sqlCollect.insert_machine_making_data(data["name"], "搬运工具", tag_transport_channel,
|
|
|
|
|
|
|
+ sqlCollect.insert_machine_making_data(data["name"], task_mark, tag_transport_channel,
|
|
|
data["video_url"], data["video_url"], data["pq_ids"],
|
|
data["video_url"], data["video_url"], data["pq_ids"],
|
|
|
data["title_category"],
|
|
data["title_category"],
|
|
|
code,
|
|
code,
|
|
@@ -353,7 +353,7 @@ class CarryViode:
|
|
|
"搬运工具",
|
|
"搬运工具",
|
|
|
data['tag']
|
|
data['tag']
|
|
|
]))
|
|
]))
|
|
|
- self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark)
|
|
|
|
|
|
|
+ self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark, "搬运工具")
|
|
|
if data["transform_rule"] == "仅改造" or data["transform_rule"] == "是":
|
|
if data["transform_rule"] == "仅改造" or data["transform_rule"] == "是":
|
|
|
try:
|
|
try:
|
|
|
width, height = FFmpeg.get_w_h_size(video_path)
|
|
width, height = FFmpeg.get_w_h_size(video_path)
|
|
@@ -585,7 +585,7 @@ class CarryViode:
|
|
|
"搬运改造",
|
|
"搬运改造",
|
|
|
data['tag']
|
|
data['tag']
|
|
|
]))
|
|
]))
|
|
|
- self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark)
|
|
|
|
|
|
|
+ self.insert_pq(REDIS_NAME, data, oss_object_key, title, tags, tag_transport_channel, channel_mark, "搬运改造")
|
|
|
return
|
|
return
|
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
data["transform_rule"] = "仅改造"
|
|
data["transform_rule"] = "仅改造"
|
