|
@@ -1864,13 +1864,13 @@ class PoolRecall(object):
|
|
|
# 判断当前日期的小时级列表是否更新
|
|
|
now_date = datetime.today()
|
|
|
now_dt = datetime.strftime(now_date, '%Y%m%d')
|
|
|
- now_pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{now_dt}"
|
|
|
+ now_pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{now_dt}"
|
|
|
if self.redis_helper.key_exists(key_name=now_pool_recall_key):
|
|
|
value = {'date': now_dt}
|
|
|
self.redis_helper.set_data_to_redis(key_name=record_key, value=str(value), expire_time=expire_time)
|
|
|
else:
|
|
|
redis_dt = datetime.strftime(now_date - timedelta(days=1), '%Y%m%d')
|
|
|
- now_pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{redis_dt}"
|
|
|
+ now_pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{redis_dt}"
|
|
|
value = {'date': redis_dt}
|
|
|
self.redis_helper.set_data_to_redis(key_name=record_key, value=str(value), expire_time=expire_time)
|
|
|
return now_pool_recall_key
|
|
@@ -1896,11 +1896,11 @@ class PoolRecall(object):
|
|
|
now_dt = datetime.strftime(now_date, '%Y%m%d')
|
|
|
if record_dt == now_dt:
|
|
|
# 已获取当前日期数据
|
|
|
- pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{now_dt}"
|
|
|
+ pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{now_dt}"
|
|
|
idx = self.get_video_idx(pool_recall_key=pool_recall_key, last_video_key=last_video_key)
|
|
|
elif record_dt == datetime.strftime((now_date - timedelta(days=1)), '%Y%m%d'):
|
|
|
# 记录的dt - 当前dt = 1,判断当前h数据是否已更新
|
|
|
- now_pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{now_dt}"
|
|
|
+ now_pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{now_dt}"
|
|
|
if self.redis_helper.key_exists(key_name=now_pool_recall_key):
|
|
|
new_record = {'date': now_dt}
|
|
|
self.redis_helper.set_data_to_redis(key_name=record_key,
|
|
@@ -1910,7 +1910,7 @@ class PoolRecall(object):
|
|
|
self.redis_helper.del_keys(key_name=last_video_key)
|
|
|
pool_recall_key = now_pool_recall_key
|
|
|
else:
|
|
|
- pool_recall_key = f"{pool_key_prefix}:{self.data_key}:{self.rule_key_30day}:{record_dt}"
|
|
|
+ pool_recall_key = f"{pool_key_prefix}{self.data_key}:{self.rule_key_30day}:{record_dt}"
|
|
|
idx = self.get_video_idx(pool_recall_key=pool_recall_key, last_video_key=last_video_key)
|
|
|
else:
|
|
|
idx = 0
|