From 1be8fb3aed3f8a55c0dcb6d021685cbb2c79e6ec Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 20 三月 2024 18:47:54 +0800
Subject: [PATCH] 接口调整
---
utils/data_export_util.py | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index bb25f5f..e8463e5 100644
--- a/utils/data_export_util.py
+++ b/utils/data_export_util.py
@@ -19,18 +19,22 @@
def export_l2_excel(code, date=None):
# 鑾峰彇L2鐨勬暟鎹�
- fdatas = get_l2_datas(code)
+ fdatas = get_l2_datas(code, date=date)
__save_l2_datas(code, fdatas)
# 鑾峰彇L2鐨勬暟鎹�
-def get_l2_datas(code, date=None):
- local_today_datas = log_export.load_l2_from_log(date)
- datas = local_today_datas[code]
+def get_l2_datas(code, today_datas=None, date=None):
+ datas = today_datas
+ if datas is None:
+ local_today_datas = log_export.load_l2_from_log(date)
+ datas = local_today_datas.get(code)
+ if not datas:
+ datas = []
process_indexs = log_export.get_l2_process_position(code, date)
trade_indexs = log_export.get_l2_trade_position(code, date)
real_position_indexes = log_export.get_real_place_order_positions(code, date)
- deal_list = log_export.load_huaxin_deal_record(code)
+ deal_list = log_export.load_huaxin_deal_record(code, date)
deal_list_dict = {}
for d in deal_list:
deal_list_dict[str(d[0])] = d
@@ -148,7 +152,12 @@
# 涔�
if cancel_data:
try:
- cancel_info = "{}-{}".format(cancel_data["index"],f"{cancel_data['val']['time']}") + (f".{cancel_data['val']['tms']}" if "tms" in cancel_data["val"] else '')
+ left_num = data["val"]["num"] - cancel_data["val"]["num"]
+ if left_num > 0:
+ cancel_info = f"鎴愪氦:{left_num} 搴忓彿:{cancel_data['index']}"
+ else:
+ cancel_info = "{}-{}".format(cancel_data["index"], f"{cancel_data['val']['time']}") + (
+ f".{cancel_data['val']['tms']}" if "tms" in cancel_data["val"] else '')
except Exception as e:
logging.exception(e)
else:
@@ -274,6 +283,6 @@
if __name__ == "__main__":
try:
- export_l2_excel("002036")
+ get_l2_datas("600822", date="2024-03-12")
except Exception as e:
logging.exception(e)
--
Gitblit v1.8.0