From 7c6d06136079b73c5676c716c992fdebb23cca7c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 27 五月 2025 16:15:31 +0800
Subject: [PATCH] bug修复
---
l2_data_parser.py | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/l2_data_parser.py b/l2_data_parser.py
index 0574cfb..07d14c1 100644
--- a/l2_data_parser.py
+++ b/l2_data_parser.py
@@ -227,9 +227,11 @@
# 灏嗘枃浠跺啓鍏ュ埌鏂囨湰
writer.writerow(row)
+
def test1(args):
index, df = args
print(index)
+
def pre_process_transactions(csv_path="E:/娴嬭瘯鏁版嵁/Transaction_Test.csv"):
def str_to_float(s):
@@ -265,9 +267,6 @@
'EndTime': group['TradeTime'].iloc[-1],
'EndPrice': group['TradePrice'].iloc[-1]
})
-
-
-
dtype = {
'SecurityID': 'category', # 浣庡熀鏁板垎绫绘暟鎹�
@@ -384,26 +383,35 @@
elif _type == 'MarketData':
parse_market_data(day)
elif _type == 'Transaction_New':
- transaction_big_order_parser.pre_process_transactions(f"/home/userzjj/ftp/{day}/Transaction.csv")
+ if len(params) > 2:
+ process_count = int(params[2].strip())
+ else:
+ process_count = 4
+
+ transaction_big_order_parser.pre_process_transactions(f"/home/userzjj/ftp/{day}/Transaction.csv",
+ process_count=process_count)
transaction_big_order_parser.concat_pre_transactions(f"/home/userzjj/ftp/{day}/Transaction")
elif _type == 'NGTSTick_New':
- transaction_big_order_parser.pre_process_ngtsticks(f"/home/userzjj/ftp/{day}/NGTSTick.csv")
+ if len(params) > 2:
+ process_count = int(params[2].strip())
+ else:
+ process_count = 4
+ transaction_big_order_parser.pre_process_ngtsticks(f"/home/userzjj/ftp/{day}/NGTSTick.csv",
+ process_count=process_count)
transaction_big_order_parser.concat_pre_ngtsticks(f"/home/userzjj/ftp/{day}/NGTSTick")
elif _type == 'Transaction_Concat':
transaction_big_order_parser.concat_pre_transactions(f"/home/userzjj/ftp/{day}/Transaction")
elif _type == 'NGTSTick_Concat':
transaction_big_order_parser.concat_pre_ngtsticks(f"/home/userzjj/ftp/{day}/NGTSTick")
-
-
elif _type == 'ExtractDealBigOrder':
- # 鎻愬彇鎵�鏈夋垚浜ょ殑澶у崟
- if len(params) > 2:
- save_path = params[2].strip()
+ # 鍛戒护妯″紡 /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")
else:
- save_path = None
+ if tool.is_sh_code(code):
+ transaction_big_order_parser.extract_big_order_of_code(f"/home/userzjj/ftp/{day}/NGTSTick", code)
+ else:
+ transaction_big_order_parser.extract_big_order_of_code(f"/home/userzjj/ftp/{day}/Transaction", code)
- if len(params) > 3:
- target_code = params[3].strip()
- else:
- target_code = None
- parse_deal_big_orders(day, save_path, target_code)
--
Gitblit v1.8.0