From 7d3c00d278c7f45a9c5e02a9410fb69d968de438 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 九月 2024 17:28:58 +0800
Subject: [PATCH] bug修复
---
api/outside_api_command_callback.py | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index e4fb093..0c7baa3 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -34,8 +34,9 @@
logger_trade, logger_trade_position_api_request, logger_request_api, \
logger_real_place_order_position, logger_device
from output import l2_output_util
-from third_data import kpl_data_manager, kpl_util, history_k_data_manager, huaxin_l1_data_manager
-from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager
+from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager
+from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager, RealTimeKplMarketData, \
+ RadicalBuyBlockManager
from third_data.history_k_data_manager import HistoryKDataManager
from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils
from third_data.kpl_data_manager import KPLDataManager
@@ -559,6 +560,11 @@
l1_subscript_codes_manager.save_codes(codes_sh, codes_sz)
result = {"code": 0, "data": {"codes_sh": len(codes_sh), "codes_sz": len(codes_sz)}}
self.send_response(result, client_id, request_id)
+ # 鎷夊彇涓夋柟鏉垮潡
+ codes = []
+ codes.extend(codes_sh)
+ codes.extend(codes_sz)
+ threading.Thread(target=third_blocks_manager.load_if_less, args=(codes,), daemon=True).start()
except Exception as e:
logger_debug.error(e)
@@ -1219,17 +1225,24 @@
# 鑾峰彇绗笁鏂规澘鍧楁暟鎹�
code = data["code"]
source_dict = copy.deepcopy(CodeThirdBlocksManager().get_source_blocks(code))
+ if not source_dict:
+ source_dict = {}
source_origin_dict = copy.deepcopy(CodeThirdBlocksManager().get_source_blocks_origin(code))
- kpl_blocks = KPLCodeJXBlockManager().get_jx_blocks_radical(code)
+ if not source_origin_dict:
+ source_origin_dict = {}
+ kpl_blocks = RadicalBuyBlockManager.get_code_kpl_blocks(code)
if kpl_blocks is None:
kpl_blocks = set()
- match_blocks, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, kpl_blocks)
+ if not kpl_blocks:
+ KPLCodeJXBlockManager().load_jx_blocks_radical(code)
+
+ filter_blocks, match_blocks = RadicalBuyBlockManager.get_code_blocks(code)
source_origin_dict[SOURCE_TYPE_KPL] = kpl_blocks
source_dict[SOURCE_TYPE_KPL] = BlockMapManager().filter_blocks(kpl_blocks)
data = {
"blocks": {},
"origin_blocks": {},
- "match_blocks": list(match_blocks)
+ "match_blocks": [list(filter_blocks), list(match_blocks)]
}
for s in source_origin_dict:
data["origin_blocks"][s] = list(source_origin_dict[s])
@@ -1241,6 +1254,7 @@
request_id)
except Exception as e:
logging.exception(e)
+ logger_debug.exception(e)
self.send_response({"code": 1, "msg": f"鏁版嵁澶勭悊鍑洪敊锛歿e}"}, client_id, request_id)
finally:
use_time = time.time() - __start_time
--
Gitblit v1.8.0