diff --git a/flask_app/general/post_processing.py b/flask_app/general/post_processing.py index 04923b8..3bef0c1 100644 --- a/flask_app/general/post_processing.py +++ b/flask_app/general/post_processing.py @@ -3,7 +3,7 @@ import json import re from flask_app.general.format_date import format_chinese_date from flask_app.general.format_amout import format_amount -from flask_app.general.接口_技术偏离表 import extract_matching_keys, prepare_for_zige_info, \ +from flask_app.routes.接口_技术偏离表 import extract_matching_keys, prepare_for_zige_info, \ process_functions_in_parallel diff --git a/flask_app/routes/__init__.py b/flask_app/routes/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/flask_app/routes/get_deviation.py b/flask_app/routes/get_deviation.py index 8cea1ab..d59f92a 100644 --- a/flask_app/routes/get_deviation.py +++ b/flask_app/routes/get_deviation.py @@ -1,12 +1,11 @@ # flask_app/routes/get_deviation.py -import time -from flask import Blueprint, request, jsonify, Response, stream_with_context, g +from flask import Blueprint, jsonify, Response, g import json import os from flask_app.main.download import download_file -from flask_app.general.接口_技术偏离表 import get_tech_and_business_deviation -from flask_app.routes.utils import generate_deviation_response, validate_request, validate_and_setup_logger +from flask_app.routes.接口_技术偏离表 import get_tech_and_business_deviation +from flask_app.routes.utils import generate_deviation_response, validate_and_setup_logger from flask_app.ConnectionLimiter import require_connection_limit get_deviation_bp = Blueprint('get_deviation', __name__) @get_deviation_bp.route('/get_deviation', methods=['POST']) diff --git a/flask_app/routes/little_zbparse.py b/flask_app/routes/little_zbparse.py index 32ebe7e..f3c75e3 100644 --- a/flask_app/routes/little_zbparse.py +++ b/flask_app/routes/little_zbparse.py @@ -2,11 +2,11 @@ import json import os -from flask import Blueprint, request, jsonify, Response, g +from flask import Blueprint, jsonify, g from flask_app.ConnectionLimiter import require_connection_limit from flask_app.main.download import download_file -from flask_app.general.接口_小解析 import little_parse_main +from flask_app.routes.接口_小解析 import little_parse_main from flask_app.routes.utils import validate_and_setup_logger little_zbparse_bp = Blueprint('little_zbparse', __name__) diff --git a/flask_app/routes/upload.py b/flask_app/routes/upload.py index 783b07b..5a91030 100644 --- a/flask_app/routes/upload.py +++ b/flask_app/routes/upload.py @@ -5,10 +5,10 @@ import os import time from flask_app.main.download import download_file -from flask_app.main.工程标解析main import engineering_bid_main -from flask_app.货物标.货物标解析main import goods_bid_main +from flask_app.routes.工程标解析main import engineering_bid_main +from flask_app.routes.货物标解析main import goods_bid_main from flask_app.general.post_processing import outer_post_processing -from flask_app.routes.utils import generate_deviation_response, validate_request, validate_and_setup_logger +from flask_app.routes.utils import generate_deviation_response, validate_and_setup_logger from flask_app.ConnectionLimiter import require_connection_limit diff --git a/flask_app/main/工程标解析main.py b/flask_app/routes/工程标解析main.py similarity index 100% rename from flask_app/main/工程标解析main.py rename to flask_app/routes/工程标解析main.py diff --git a/flask_app/general/接口_小解析.py b/flask_app/routes/接口_小解析.py similarity index 100% rename from flask_app/general/接口_小解析.py rename to flask_app/routes/接口_小解析.py diff --git a/flask_app/general/接口_技术偏离表.py b/flask_app/routes/接口_技术偏离表.py similarity index 100% rename from flask_app/general/接口_技术偏离表.py rename to flask_app/routes/接口_技术偏离表.py diff --git a/flask_app/货物标/货物标解析main.py b/flask_app/routes/货物标解析main.py similarity index 100% rename from flask_app/货物标/货物标解析main.py rename to flask_app/routes/货物标解析main.py diff --git a/flask_app/货物标/商务服务其他要求提取.py b/flask_app/货物标/商务服务其他要求提取.py index f0a90c4..d67906d 100644 --- a/flask_app/货物标/商务服务其他要求提取.py +++ b/flask_app/货物标/商务服务其他要求提取.py @@ -280,8 +280,8 @@ def get_business_requirements(procurement_path,procurement_docpath): # TODO:改为先判断,再摘取 if __name__ == "__main__": # truncate_file = "C:\\Users\\Administrator\\Desktop\\fsdownload\\e4be098d-b378-4126-9c32-a742b237b3b1\\ztbfile_procurement.docx" - truncate_file = r"C:\Users\Administrator\Desktop\货物标\output1\陕西省公安厅交通警察总队高速公路交通安全智能感知巡查系统项目 (1)_procurement.pdf" - docx_path=r'C:\Users\Administrator\Desktop\货物标\output1\陕西省公安厅交通警察总队高速公路交通安全智能感知巡查系统项目 (1)_procurement.docx' + truncate_file = r"C:\Users\Administrator\Desktop\货物标\output1\2-招标文件(广水市教育局封闭管理)_procurement.pdf" + docx_path=r'C:\Users\Administrator\Desktop\货物标\output1\2-招标文件(广水市教育局封闭管理)_procurement.docx' # truncate_file=r"C:\Users\Administrator\Desktop\new招标文件\output5\HBDL-2024-0519-001-招标文件_procurement.pdf" # file_id = upload_file(truncate_file) processed_filepath = pdf2txt(truncate_file)