From b4480ad745510c8e81c88c20fb67cb65eef79cc5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 17 八月 2023 11:05:23 +0800
Subject: [PATCH] ++++++++++++++++ bug修复
---
utils/data_export_util.py | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index c647090..4ef3bec 100644
--- a/utils/data_export_util.py
+++ b/utils/data_export_util.py
@@ -10,18 +10,18 @@
import constant
from code_attribute import gpcode_manager
import l2.l2_data_util
-from log_module 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,8 +48,7 @@
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 = file_name.encode('utf-8').decode('gbk')
+ 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:
@@ -198,13 +197,13 @@
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__":
--
Gitblit v1.8.0