update

workers/consumption_work.py

@@ -436,18 +436,17 @@ class ConsumptionRecommend(object):
     def run(cls):
         uid = str(uuid.uuid4())
         file_path = os.path.join(CACHE_DIR, uid)
+        logger.info(f"[处理] 开始获取redis数据")
+        fs_data = os.getenv("FS_DATA")
+        # fs_data = '邓锋,DEpi6V,task:carry_data_redis_df'
+        fs_data_list = fs_data.split(',')
+        redis_name = fs_data_list[2]
+        data = RedisHelper().get_client().rpop(name=redis_name)
+        if not data:
+            logger.info('[处理] 无待执行的扫描任务')
+            return
+        data = orjson.loads(data)
         try:
-            logger.info(f"[处理] 开始获取redis数据")
-            fs_data = os.getenv("FS_DATA")
-            # fs_data = '邓锋,DEpi6V,task:carry_data_redis_df'
-            fs_data_list = fs_data.split(',')
-            redis_name = fs_data_list[2]
-            data = RedisHelper().get_client().rpop(name = redis_name)
-            if not data:
-                logger.info('[处理] 无待执行的扫描任务')
-                return
-            data = orjson.loads(data)
-
             cls.data_handle(data, file_path, redis_name)
             for filename in os.listdir(CACHE_DIR):
                 # 检查文件名是否包含关键字
@@ -461,6 +460,7 @@ class ConsumptionRecommend(object):
                         logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
             return
         except Exception as e:
+            RedisHelper().get_client().rpush(redis_name, json.dumps(data))
             for filename in os.listdir(CACHE_DIR):
                 # 检查文件名是否包含关键字
                 if uid in filename: