From 81f328532e366eef171b71810b221a9294dda78f Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 21 十二月 2023 14:31:58 +0800
Subject: [PATCH] 买入条件调整/L撤调整
---
utils/data_export_util.py | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index 6058200..7395f82 100644
--- a/utils/data_export_util.py
+++ b/utils/data_export_util.py
@@ -11,6 +11,7 @@
import constant
from code_attribute import gpcode_manager
import l2.l2_data_util
+from l2.huaxin import l2_huaxin_util
from log_module import log, log_export
from l2 import l2_data_source_util
from trade import deal_big_money_manager
@@ -18,14 +19,7 @@
def export_l2_excel(code, date=None):
# 鑾峰彇L2鐨勬暟鎹�
- local_today_datas = log_export.load_l2_from_log(date)
- datas = local_today_datas[code]
- datas = datas[-2000:]
- # 鑾峰彇L2澶勭悊浣嶇疆淇℃伅
- 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)
- fdatas = export_l2_data(code, datas, process_indexs, trade_indexs, real_position_indexes)
+ fdatas = get_l2_datas(code)
__save_l2_datas(code, fdatas)
@@ -39,8 +33,7 @@
deal_list = log_export.load_huaxin_deal_record(code)
deal_list_dict = {}
for d in deal_list:
- deal_list_dict[d[0]] = d
-
+ deal_list_dict[str(d[0])] = d
fdatas = export_l2_data(code, datas, process_indexs, trade_indexs, real_position_indexes, deal_list_dict)
return fdatas
@@ -155,12 +148,19 @@
# 涔�
if cancel_data:
try:
- cancel_info = "{}-{}".format(cancel_data["index"], cancel_data["val"]["time"])
+ 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:
- if int(data["val"].get("orderNo")) in deal_list_dict:
- cancel_info = deal_list_dict[int(data["val"].get("orderNo"))][3]
+ deal_info = deal_list_dict.get(str(data["val"].get("orderNo")))
+ if deal_info:
+ cancel_info = l2_huaxin_util.convert_time(deal_info[3],
+ with_ms=True)
format_data.append(cancel_info)
cancel_order_info = None
if trade_info:
@@ -279,6 +279,6 @@
if __name__ == "__main__":
try:
- export_l2_excel("605218")
+ export_l2_excel("002036")
except Exception as e:
logging.exception(e)
--
Gitblit v1.8.0