From b79f40afbe849f56f7c2db94e9bcebf3f5e92ec6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 04 八月 2023 09:47:45 +0800
Subject: [PATCH] redis连接池归还
---
utils/data_export_util.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index d258b7e..281afc0 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 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,7 +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 = "{}/{}_{}.xls".format(dest_dir, code, local_time)
file_name_txt = "{}/{}_{}.txt".format(dest_dir, code, local_time)
openfile = open(file_name_txt, 'w')
try:
@@ -56,7 +56,7 @@
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, '鏃堕棿')
@@ -197,8 +197,8 @@
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)
--
Gitblit v1.8.0