From 65afea1ba534b51f947cbe7989d7f4d650bbc9e6 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 04 十一月 2024 18:29:00 +0800 Subject: [PATCH] 代码异常保护 --- l2/l2_transaction_data_processor.py | 45 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 35 insertions(+), 10 deletions(-) diff --git a/l2/l2_transaction_data_processor.py b/l2/l2_transaction_data_processor.py index 055e9bb..100703b 100644 --- a/l2/l2_transaction_data_processor.py +++ b/l2/l2_transaction_data_processor.py @@ -14,12 +14,14 @@ from l2.l2_data_manager import OrderBeginPosInfo from l2.l2_data_manager_new import L2TradeDataProcessor from l2.l2_data_util import L2DataUtil +from l2.l2_limitup_sell_data_manager import L2LimitUpSellDataManager from l2.l2_transaction_data_manager import HuaXinBuyOrderManager, HuaXinSellOrderStatisticManager, BigOrderDealManager from log_module import async_log_util from log_module.log import hx_logger_l2_debug, logger_l2_trade_buy_queue, logger_debug, hx_logger_l2_upload -from trade import current_price_process_manager +from trade import current_price_process_manager, trade_constant import concurrent.futures +from trade.radical_buy_data_manager import RedicalBuyDataManager, EveryLimitupBigDealOrderManager from utils import tool @@ -53,8 +55,13 @@ buy_datas, bigger_buy_datas = HuaXinBuyOrderManager.statistic_big_buy_data(code, datas, limit_up_price) if buy_datas: BigOrderDealManager().add_buy_datas(code, buy_datas) + EveryLimitupBigDealOrderManager.add_big_buy_order_deal(code, [x[0] for x in buy_datas]) try: is_placed_order = l2_data_manager.TradePointManager.is_placed_order(order_begin_pos) + if is_placed_order: + if order_begin_pos and order_begin_pos.mode == OrderBeginPosInfo.MODE_RADICAL: + RedicalBuyDataManager.big_order_deal(code) + if is_placed_order and bigger_buy_datas: # 鏈夊ぇ浜�50w鐨勫ぇ鍗曟垚浜� buyno_map = l2_data_util.local_today_buyno_map.get(code) @@ -79,14 +86,16 @@ @classmethod def process_huaxin_transaction_datas(cls, code, datas): __start_time = time.time() - limit_up_price = gpcode_manager.get_limit_up_price(code) - if limit_up_price: - limit_up_price = round(float(limit_up_price), 2) + limit_up_price = gpcode_manager.get_limit_up_price_as_num(code) # 璁剧疆鎴愪氦浠� try: current_price_process_manager.set_trade_price(code, datas[-1][1]) + if limit_up_price > datas[-1][1]: + # 娌℃湁娑ㄥ仠 + EveryLimitupBigDealOrderManager.open_limit_up(code) except: pass + total_datas = l2_data_util.local_today_datas.get(code) use_time_list = [] try: @@ -110,6 +119,11 @@ current_price_process_manager.set_latest_not_limit_up_time(code, l2_huaxin_util.convert_time( d[3], with_ms=True)) + else: + # 涓诲姩鍗栵紙鏉夸笂锛� + if d[1] == limit_up_price: + L2LimitUpSellDataManager.clear_data(code) + break except: pass @@ -123,29 +137,37 @@ need_cancel, cancel_msg = SCancelBigNumComputer().set_big_sell_order_info_for_cancel(code, big_sell_order_info, order_begin_pos) + cancel_type = None if need_cancel: cancel_msg = f"S鎾�:{cancel_msg}" + cancel_type = trade_constant.CANCEL_TYPE_S if not need_cancel: need_cancel, cancel_msg = FCancelBigNumComputer().need_cancel_for_p(code, order_begin_pos) + cancel_type = trade_constant.CANCEL_TYPE_F # 鍒ゆ柇鏃堕棿鏄惁涓庢湰鍦版椂闂寸浉宸�5s浠ヤ笂 if tool.trade_time_sub(tool.get_now_time_str(), l2_huaxin_util.convert_time(datas[-1][3])) > 10: now_seconds = int(tool.get_now_time_str().replace(":", "")) if now_seconds < int("093200"): # or int("130000") <= now_seconds < int("130200"): need_cancel, cancel_msg = True, f"鎴愪氦鏃堕棿涓庢湰鍦版椂闂寸浉宸�10S浠ヤ笂锛寋l2_huaxin_util.convert_time(datas[-1][3])}" + cancel_type = trade_constant.CANCEL_TYPE_L2_DELAY if need_cancel: - L2TradeDataProcessor.cancel_buy(code, cancel_msg) + L2TradeDataProcessor.cancel_buy(code, cancel_msg, cancel_type=cancel_type) # GCancelBigNumComputer().set_big_sell_order_info(code, big_sell_order_info) use_time_list.append(("澶勭悊鍗栧崟鐩稿叧鎾ゆ暟鎹�", time.time() - _start_time)) _start_time = time.time() - HuaXinSellOrderStatisticManager.statistic_total_deal_volume(code, datas) + # 缁熻娑ㄥ仠鍗栨垚浜� + HuaXinSellOrderStatisticManager.statistic_total_deal_volume(code, datas, limit_up_price) use_time_list.append(("缁熻鎴愪氦閲忔暟鎹�", time.time() - _start_time)) except Exception as e: async_log_util.error(logger_debug, f"鍗栧崟缁熻寮傚父锛歿big_sell_order_info}") logger_debug.exception(e) _start_time = time.time() - cls.__statistic_thread_pool.submit(cls.statistic_big_order_infos, code, datas, order_begin_pos) + L2LimitUpSellDataManager.set_deal_datas(code, datas) + # 澶у崟缁熻 + # cls.__statistic_thread_pool.submit(cls.statistic_big_order_infos, code, datas, order_begin_pos) + cls.statistic_big_order_infos(code, datas, order_begin_pos) use_time_list.append(("缁熻涔板崟鏁版嵁", time.time() - _start_time)) _start_time = time.time() @@ -167,12 +189,14 @@ total_datas) cancel_result = FCancelBigNumComputer().need_cancel_for_deal_fast(code, buy_progress_index) if cancel_result[0]: - L2TradeDataProcessor.cancel_buy(code, f"F鎾�:{cancel_result[1]}") + L2TradeDataProcessor.cancel_buy(code, f"F鎾�:{cancel_result[1]}", + cancel_type=trade_constant.CANCEL_TYPE_F) if not cancel_result[0]: try: cancel_result = NBCancelBigNumComputer().need_cancel(code, buy_progress_index) if cancel_result[0]: - L2TradeDataProcessor.cancel_buy(code, f"澶у競鍊兼棤澶у崟鎾�:{cancel_result[1]}") + L2TradeDataProcessor.cancel_buy(code, f"澶у競鍊兼棤澶у崟鎾�:{cancel_result[1]}", + cancel_type=trade_constant.CANCEL_TYPE_NB) except: pass @@ -180,7 +204,8 @@ try: cancel_result = FCancelBigNumComputer().need_cancel_for_w(code) if cancel_result[0]: - L2TradeDataProcessor.cancel_buy(code, f"W鎾�:{cancel_result[1]}") + L2TradeDataProcessor.cancel_buy(code, f"W鎾�:{cancel_result[1]}", + cancel_type=trade_constant.CANCEL_TYPE_W) except: pass -- Gitblit v1.8.0