From 2f74f93f7c09cd59521a67ec263c56060ef1f1aa Mon Sep 17 00:00:00 2001 From: zy123 <646228430@qq.com> Date: Thu, 20 Feb 2025 16:34:06 +0800 Subject: [PATCH] =?UTF-8?q?2.20=20=E4=B8=BB=E6=B5=81=E7=A8=8B=E7=94=A8?= =?UTF-8?q?=E5=AD=90=E8=BF=9B=E7=A8=8B=E5=8C=85=E8=A3=B9=EF=BC=8C=E5=86=85?= =?UTF-8?q?=E9=83=A8=E7=94=A8=E5=A4=9A=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flask_app/routes/upload.py | 10 +++++----- flask_app/routes/工程标解析main.py | 4 ++-- flask_app/routes/货物标解析main.py | 22 +++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/flask_app/routes/upload.py b/flask_app/routes/upload.py index 4fa4b05..ad12bab 100644 --- a/flask_app/routes/upload.py +++ b/flask_app/routes/upload.py @@ -4,8 +4,8 @@ import json import os import time from flask_app.general.format_change import download_file -from flask_app.routes.工程标解析main import engineering_bid_main -from flask_app.routes.货物标解析main import goods_bid_main +from flask_app.routes.工程标解析main import engineering_bid_main_process +from flask_app.routes.货物标解析main import goods_bid_main_process from flask_app.general.post_processing import outer_post_processing from flask_app.routes.utils import generate_deviation_response, validate_and_setup_logger, create_response, sse_format, \ log_error_unique_id @@ -77,10 +77,10 @@ def process_and_stream(file_url, zb_type): good_list = None processing_functions = { - 1: engineering_bid_main, #工程标解析 - 2: goods_bid_main #货物标解析/服务标解析 + 1: engineering_bid_main_process, #工程标解析 + 2: goods_bid_main_process #货物标解析/服务标解析 } - processing_func = processing_functions.get(zb_type, goods_bid_main) + processing_func = processing_functions.get(zb_type, goods_bid_main_process) for data in processing_func(output_folder, downloaded_filepath, file_type, unique_id): #逐一接收货物标 工程标解析内容，为前端网页展示服务 if not data.strip(): diff --git a/flask_app/routes/工程标解析main.py b/flask_app/routes/工程标解析main.py index 34dc08f..f7105df 100644 --- a/flask_app/routes/工程标解析main.py +++ b/flask_app/routes/工程标解析main.py @@ -23,7 +23,7 @@ from flask_app.general.商务技术评分提取 import combine_evaluation_standa from flask_app.general.format_change import pdf2docx, docx2pdf -def preprocess_file_main(output_folder, file_path, file_type, logger): +def engineering_bid_main_process(output_folder, file_path, file_type, logger): # 这里是你原本处理请求的地方 with multiprocessing.Pool(processes=1) as pool: result = pool.apply( @@ -242,7 +242,7 @@ def fetch_bid_opening(invalid_deleted_docx, merged_baseinfo_path_more, clause_pa def engineering_bid_main(output_folder, file_path, file_type, unique_id): logger = get_global_logger(unique_id) # 预处理文件，获取处理后的数据 - processed_data = preprocess_file_main(output_folder, file_path, file_type, logger) + processed_data = preprocess_files(output_folder, file_path, file_type, logger) if not processed_data: error_response = { 'error': '文件预处理失败。请检查文件类型并重试。' diff --git a/flask_app/routes/货物标解析main.py b/flask_app/routes/货物标解析main.py index 414b9f1..5788952 100644 --- a/flask_app/routes/货物标解析main.py +++ b/flask_app/routes/货物标解析main.py @@ -16,12 +16,12 @@ from flask_app.general.无效标和废标公共代码 import combine_find_invali from flask_app.货物标.资格审查main import combine_qualification_review from flask_app.general.商务技术评分提取 import combine_evaluation_standards from concurrent.futures import ThreadPoolExecutor -def preprocess_file_main(output_folder, file_path, file_type,logger): +def goods_bid_main_process(output_folder, file_path, file_type,unique_id): # 这里是你原本处理请求的地方 with multiprocessing.Pool(processes=1) as pool: result = pool.apply( - preprocess_files, # 你的实际执行函数 - args=(output_folder, file_path, file_type, logger) + goods_bid_main, # 你的实际执行函数 + args=(output_folder, file_path, file_type, unique_id) ) return result def preprocess_files(output_folder, file_path, file_type,logger): @@ -234,7 +234,7 @@ def post_process_baseinfo(base_info,logger): def goods_bid_main(output_folder, file_path, file_type, unique_id): logger = get_global_logger(unique_id) # 预处理文件，获取处理后的数据 - processed_data = preprocess_file_main(output_folder, file_path, file_type,logger) + processed_data = preprocess_files(output_folder, file_path, file_type,logger) if not processed_data: error_response = { 'error': '文件预处理失败。请检查文件类型并重试。' @@ -248,8 +248,8 @@ def goods_bid_main(output_folder, file_path, file_type, unique_id): 'evaluation_standards': executor.submit(fetch_evaluation_standards,processed_data['invalid_deleted_docx'], #技术评分 商务评分 processed_data['evaluation_method_path'],logger), - # 'invalid_requirements': executor.submit(fetch_invalid_requirements, processed_data['invalid_added_docx'], #无效标与废标项 - # output_folder,logger), + 'invalid_requirements': executor.submit(fetch_invalid_requirements, processed_data['invalid_added_docx'], #无效标与废标项 + output_folder,logger), 'bidding_documents_requirements': executor.submit(fetch_bidding_documents_requirements,processed_data['invalid_deleted_docx'],processed_data['merged_baseinfo_path'], processed_data['clause_path'],logger), #投标文件要求 @@ -257,12 +257,12 @@ def goods_bid_main(output_folder, file_path, file_type, unique_id): 'opening_bid': executor.submit(fetch_bid_opening, processed_data['invalid_deleted_docx'],processed_data['merged_baseinfo_path'], processed_data['clause_path'],logger), #开评定标流程 - # 'base_info': executor.submit(fetch_project_basic_info, processed_data['invalid_deleted_docx'],processed_data['merged_baseinfo_path'], #基础信息 - # processed_data['procurement_path'],processed_data['clause_path'],logger), + 'base_info': executor.submit(fetch_project_basic_info, processed_data['invalid_deleted_docx'],processed_data['merged_baseinfo_path'], #基础信息 + processed_data['procurement_path'],processed_data['clause_path'],logger), - # 'qualification_review': executor.submit(fetch_qualification_review, processed_data['invalid_deleted_docx'], #资格审查 - # processed_data['qualification_path'], - # processed_data['notice_path'],logger), + 'qualification_review': executor.submit(fetch_qualification_review, processed_data['invalid_deleted_docx'], #资格审查 + processed_data['qualification_path'], + processed_data['notice_path'],logger), } collected_good_list = [] # 提前处理这些不依赖的任务，按完成顺序返回