From d5aa41a4647fe47e72bb21f7dff6962cfe3906be Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期三, 28 五月 2025 15:07:10 +0800 Subject: [PATCH] 解析bug修复 --- l2_data_parser.py | 4 ++-- data_parser/transaction_big_order_parser.py | 25 +++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/data_parser/transaction_big_order_parser.py b/data_parser/transaction_big_order_parser.py index 405432c..0680ce9 100644 --- a/data_parser/transaction_big_order_parser.py +++ b/data_parser/transaction_big_order_parser.py @@ -197,7 +197,18 @@ __combined_df_cache = {} -def extract_big_order_of_code(dir_path, code=None): +def extract_big_order_of_all(dir_path): + combined_path = os.path.join(dir_path, 'combined.csv') + if not os.path.exists(combined_path): + print("鎷兼帴鏁版嵁涓嶅瓨鍦�") + return + codes = extract_big_order_codes(dir_path) + print("鎬讳唬鐮佹暟閲忥細", len(codes)) + for code in codes: + extract_big_order_of_code(dir_path, code) + + +def extract_big_order_of_code(dir_path, code): """ 鎻愬彇浠g爜鐨勫ぇ鍗� @param dir_path: 鏁版嵁鐩綍 @@ -226,17 +237,7 @@ if not os.path.exists(combined_path): print("鎷兼帴鏁版嵁涓嶅瓨鍦�") return - - if not code: - codes = extract_big_order_codes(dir_path) - print("鎬讳唬鐮佹暟閲忥細", len(codes)) - for code in codes: - extract_big_order_of_code(dir_path, code) - if code: - output_path = os.path.join(dir_path, f"big_buy_{code}.csv") - else: - output_path = os.path.join(dir_path, f"big_buy.csv") - + output_path = os.path.join(dir_path, f"big_buy_{code}.csv") if os.path.exists(output_path): print("璺緞宸插瓨鍦�:", output_path) return diff --git a/l2_data_parser.py b/l2_data_parser.py index 07d14c1..3d72c80 100644 --- a/l2_data_parser.py +++ b/l2_data_parser.py @@ -407,8 +407,8 @@ # 鍛戒护妯″紡 /home/userzjj/app/gp-server/l2_data_parser ExtractDealBigOrder 2025-05-09 # 鏍规嵁code鎻愬彇澶у崟 if not code: - transaction_big_order_parser.extract_big_order_of_code(f"/home/userzjj/ftp/{day}/NGTSTick") - transaction_big_order_parser.extract_big_order_of_code(f"/home/userzjj/ftp/{day}/Transaction") + transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/NGTSTick") + transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/Transaction") else: if tool.is_sh_code(code): transaction_big_order_parser.extract_big_order_of_code(f"/home/userzjj/ftp/{day}/NGTSTick", code) -- Gitblit v1.8.0