From 86e0061f9cf211b98252a9e6b71d6c9801e4a16b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期日, 18 十二月 2022 18:08:03 +0800
Subject: [PATCH] 撤单策略再次修改
---
l2_data_manager.py | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/l2_data_manager.py b/l2_data_manager.py
index 5dbf14b..8517103 100644
--- a/l2_data_manager.py
+++ b/l2_data_manager.py
@@ -11,20 +11,21 @@
import big_money_num_manager
import code_data_util
import constant
-import data_process
import global_data_loader
import global_util
+import industry_codes_sort
import l2_data_log
import l2_data_util
import gpcode_manager
import l2_trade_factor
+import log
import redis_manager
import ths_industry_util
import tool
import trade_manager
-from log import logger_l2_trade, logger_l2_trade_cancel, logger_l2_trade_buy, logger_l2_process
+from log import logger_l2_trade, logger_l2_trade_cancel, logger_l2_trade_buy, logger_l2_process,logger_l2_data
import trade_data_manager
import limit_up_time_manager
@@ -187,18 +188,25 @@
# 鑾峰彇浠婃棩鐨勬暟鎹�
if local_today_datas.get(code) is None or force:
- datas = []
- keys = redis.keys("l2-{}-*".format(code))
- for k in keys:
- value = redis.get(k)
- _data = l2_data_util.l2_data_key_2_obj(k, value)
- datas.append(_data)
- # 鎺掑簭
- new_datas = sorted(datas,
- key=lambda e: (int(e.__getitem__('val')["time"].replace(":", "")), e.__getitem__('index')))
- local_today_datas[code] = new_datas
- # 鏍规嵁浠婃棩鏁版嵁鍔犺浇
- l2_data_util.load_num_operate_map(local_today_num_operate_map, code, local_today_datas.get(code), force)
+ datas = log.load_l2_from_log()
+ datas = datas.get(code)
+ if datas is None:
+ datas= []
+ local_today_datas[code] = datas
+
+ # 浠庢暟鎹簱鍔犺浇
+ # datas = []
+ # keys = redis.keys("l2-{}-*".format(code))
+ # for k in keys:
+ # value = redis.get(k)
+ # _data = l2_data_util.l2_data_key_2_obj(k, value)
+ # datas.append(_data)
+ # # 鎺掑簭
+ # new_datas = sorted(datas,
+ # key=lambda e: (int(e.__getitem__('val')["time"].replace(":", "")), e.__getitem__('index')))
+ # local_today_datas[code] = new_datas
+ # 鏍规嵁浠婃棩鏁版嵁鍔犺浇
+ l2_data_util.load_num_operate_map(local_today_num_operate_map, code, local_today_datas.get(code), force)
@tool.async_call
@@ -268,6 +276,10 @@
# 璁剧疆杩涘唴瀛�
local_latest_datas[code] = datas
__set_l2_data_latest_count(code, len(datas))
+ try:
+ logger_l2_data.info("{}-{}",code,add_datas)
+ except Exception as e:
+ logging.exception(e)
saveL2Data(code, add_datas)
@@ -784,7 +796,7 @@
industry, codes = ths_industry_util.get_same_industry_codes(code, gpcode_manager.get_gp_list())
if industry is None:
return True, "娌℃湁鑾峰彇鍒拌涓�"
- codes_index = limit_up_time_manager.sort_code_by_limit_time(codes)
+ codes_index = industry_codes_sort.sort_codes(codes,code)
if codes_index is not None and codes_index.get(code) is not None and codes_index.get(code) > 1:
return False, "鍚屼竴鏉垮潡涓�佷笁,鑰佸洓,...涓嶈兘涔�"
--
Gitblit v1.8.0