From 2f2516749615da866e96d8d24e499b7ecbb63a3e Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 23 六月 2025 12:28:52 +0800
Subject: [PATCH] 默认交易模式变更/真实下单位置计算位置修改
---
l2_data_parser.py | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/l2_data_parser.py b/l2_data_parser.py
index 423ee49..3cab7b0 100644
--- a/l2_data_parser.py
+++ b/l2_data_parser.py
@@ -9,6 +9,7 @@
import pandas as pd
+from data_parser import transaction_big_order_parser
from db import mysql_data_delegate as mysql_data
from huaxin_client.l2_client_test import L2TransactionDataManager
from log_module import log_export
@@ -226,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):
@@ -264,9 +267,6 @@
'EndTime': group['TradeTime'].iloc[-1],
'EndPrice': group['TradePrice'].iloc[-1]
})
-
-
-
dtype = {
'SecurityID': 'category', # 浣庡熀鏁板垎绫绘暟鎹�
@@ -358,13 +358,13 @@
print(f"澶勭悊瀹屾瘯锛屾�诲叡{index}鎵�")
-if __name__ == '__main__':
+if __name__ == '__main__1':
# df = pd.read_csv(f"E:/娴嬭瘯鏁版嵁/Transaction_Test.csv")
pre_process_transactions()
# 鍛戒护妯″紡 /home/userzjj/app/gp-server/l2_data_parser Transaction 2025-05-08
# 瑙ｆ瀽澶у崟锛� /home/userzjj/app/gp-server/l2_data_parser ExtractDealBigOrder 2025-05-09 /home/userzjj/鏈�缁堟垚浜ゆ暟鎹�20250509.txt 000555
-if __name__ == '__main__1':
+if __name__ == '__main__':
if len(sys.argv) > 1:
params = sys.argv[1:]
print("鎺ユ敹鐨勫弬鏁�", params)
@@ -383,18 +383,33 @@
elif _type == 'MarketData':
parse_market_data(day)
elif _type == 'Transaction_New':
- pre_process_transactions(f"/home/userzjj/ftp/{day}/Transaction.csv")
- elif _type == 'NGTSTick_New':
- pre_process_ngtstick(f"/home/userzjj/ftp/{day}/NGTSTick.csv")
- elif _type == 'ExtractDealBigOrder':
- # 鎻愬彇鎵�鏈夋垚浜ょ殑澶у崟
if len(params) > 2:
- save_path = params[2].strip()
+ process_count = int(params[2].strip())
else:
- save_path = None
+ process_count = 4
- if len(params) > 3:
- target_code = params[3].strip()
+ 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':
+ if len(params) > 2:
+ process_count = int(params[2].strip())
else:
- target_code = None
- parse_deal_big_orders(day, save_path, target_code)
+ 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':
+ # 鍛戒护妯″紡 /home/userzjj/app/gp-server/l2_data_parser ExtractDealBigOrder 2025-05-09
+ if len(params) > 2:
+ process_count = int(params[2].strip())
+ else:
+ process_count = 10
+ transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/NGTSTick",
+ process_count=process_count)
+ transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/Transaction",
+ process_count=process_count)
--
Gitblit v1.8.0