From 2b01412bb139aefe3b4e6be1ca02115d24dbeabb Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 11 九月 2023 13:56:52 +0800
Subject: [PATCH] bug修复
---
utils/data_export_util.py | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index d258b7e..2804cec 100644
--- a/utils/data_export_util.py
+++ b/utils/data_export_util.py
@@ -2,6 +2,7 @@
鏁版嵁瀵煎嚭宸ュ叿
"""
import json
+import logging
import os
import time
@@ -10,18 +11,18 @@
import constant
from code_attribute import gpcode_manager
import l2.l2_data_util
-from logs_ import log
+from log_module import log, log_export
from l2 import l2_data_source_util
from trade import deal_big_money_manager
def export_l2_excel(code, date=None):
# 鑾峰彇L2鐨勬暟鎹�
- local_today_datas = log.load_l2_from_log(date)
+ local_today_datas = log_export.load_l2_from_log(date)
datas = local_today_datas[code]
# 鑾峰彇L2澶勭悊浣嶇疆淇℃伅
- process_indexs = log.get_l2_process_position(code, date)
- trade_indexs = log.get_l2_trade_position(code, date)
+ process_indexs = log_export.get_l2_process_position(code, date)
+ trade_indexs = log_export.get_l2_trade_position(code, date)
export_l2_data(code, datas, process_indexs, trade_indexs)
@@ -48,15 +49,12 @@
num_dict[data["val"]["num"]].append(data)
local_time = time.strftime("%Y%m%dT%H%M%S", time.localtime(time.time()))
- file_name = "{}/{}_{}_{}.xls".format(dest_dir, code, gpcode_manager.get_code_name(code), local_time)
+ file_name = "{}/{}_{}.xls".format(dest_dir, code, local_time)
file_name_txt = "{}/{}_{}.txt".format(dest_dir, code, local_time)
- openfile = open(file_name_txt, 'w')
- try:
+ with open(file_name_txt, 'w') as openfile:
for data in datas:
openfile.write(json.dumps(data) + "\n")
- finally:
- openfile.close()
- wb = xlwt.Workbook()
+ wb = xlwt.Workbook(encoding="utf-8")
ws = wb.add_sheet('sheet1')
ws.write(0, 0, '搴忓彿')
ws.write(0, 1, '鏃堕棿')
@@ -67,6 +65,7 @@
ws.write(0, 6, '绫诲瀷')
ws.write(0, 7, '閲嶅鏁伴噺')
ws.write(0, 8, '鎾ゅ崟鏃堕棿')
+ ws.write(0, 9, '璁㈠崟鍙�')
index = 0
for data in datas:
@@ -138,6 +137,7 @@
else:
ws.write(index, 6, '鍗栨挙', style)
ws.write(index, 7, data["re"], style)
+ ws.write(index, 9, data["val"].get("orderNo"), style)
# 鏌ヨ鏄惁鎾ゅ崟
if int(data["val"]["operateType"]) == 0:
cancel = False
@@ -148,8 +148,11 @@
num_operate_map[
code])
if buy_index == data["index"]:
- ws.write(index, 8, "{}-{}".format(d["index"], d["val"]["time"]), cancel_style)
- break
+ try:
+ ws.write(index, 8, "{}-{}".format(d["index"], d["val"]["time"]), cancel_style)
+ break
+ except Exception as e:
+ logging.exception(e)
ws.write(index, 3, "{}涓�".format(round(int(data["val"]["num"]) * float(data["val"]["price"]) / 100, 2)), style)
wb.save(file_name)
@@ -197,14 +200,14 @@
def test(code):
- progresses = log.export_trade_progress(code)
- local_today_datas = log.load_l2_from_log("2023-04-04")
+ progresses = log_export.export_trade_progress(code)
+ local_today_datas = log_export.load_l2_from_log("2023-04-04")
datas = local_today_datas[code]
num_operate_map = {}
l2.l2_data_util.load_num_operate_map(num_operate_map, code, datas)
for progress in progresses:
- deal_big_money_manager.set_trade_progress(code, progress, datas, num_operate_map[code])
+ deal_big_money_manager.DealComputeProgressManager().set_trade_progress(code, progress, datas, num_operate_map[code])
if __name__ == "__main__":
- export_l2_excel("002765")
+ export_l2_excel("002207")
--
Gitblit v1.8.0