From 365491c1fcf523994035e4bd28d8b5872dd6ec98 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期四, 31 七月 2025 14:47:48 +0800 Subject: [PATCH] 除权采用掘金更新K线 --- servers/server.py | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/servers/server.py b/servers/server.py index ee9194d..d3a4faf 100644 --- a/servers/server.py +++ b/servers/server.py @@ -4,16 +4,13 @@ import decimal import json import logging -import random import socketserver import socket -import threading import time from cancel_strategy.s_l_h_cancel_strategy import LCancelBigNumComputer -from utils import alert_util, data_process, global_util, ths_industry_util, tool, import_util, socket_util +from utils import data_process, global_util, ths_industry_util, tool, import_util, socket_util from code_attribute import code_volumn_manager, global_data_loader, gpcode_manager, first_target_code_data_processor -import constant from l2 import l2_data_manager_new, l2_data_manager, code_price_manager import l2.l2_data_util @@ -25,7 +22,7 @@ current_price_process_manager, trade_juejin, trade_constant import l2.transaction_progress -from log_module.log import logger_trade_delegate, logger_buy_1_volumn_record, \ +from log_module.log import logger_trade_delegate, logger_buy_1_volumn_record, \ logger_l2_trade_queue, logger_l2_trade_buy_queue, logger_debug from trade.huaxin import huaxin_trade_record_manager from trade.trade_manager import TradeTargetCodeModeManager @@ -261,7 +258,8 @@ limit_up_price = gpcode_manager.get_limit_up_price(code) if limit_up_price is not None: - code_price_manager.Buy1PriceManager().process(code, buy_one_price, buy_one_volumn, buy_time, limit_up_price, + code_price_manager.Buy1PriceManager().process(code, buy_one_price, buy_one_volumn, buy_time, + limit_up_price, sell_one_price, sell_one_volumn) _start_time = time.time() msg += "涔�1浠锋牸澶勭悊锛�" + f"{_start_time - __start_time} " @@ -279,14 +277,16 @@ buy_one_price_ = decimal.Decimal(round(float(buy_one_price), 2)).quantize( decimal.Decimal("0.00")) # 鑾峰彇鎵ц浣嶆椂闂� - order_begin_pos = l2_data_manager.TradePointManager().get_buy_compute_start_data_cache(code) + order_begin_pos = l2_data_manager.TradePointManager().get_buy_compute_start_data_cache( + code) if True: # 鍙湁涓嬪崟杩囧悗鎵嶈幏鍙栦氦鏄撹繘搴� exec_time = None try: if order_begin_pos.buy_exec_index and order_begin_pos.buy_exec_index > -1: exec_time = \ - l2.l2_data_util.local_today_datas.get(code)[order_begin_pos.buy_exec_index]["val"]["time"] + l2.l2_data_util.local_today_datas.get(code)[ + order_begin_pos.buy_exec_index]["val"]["time"] except: pass buy_progress_index = self.tradeBuyQueue.compute_traded_index(code, @@ -294,7 +294,9 @@ buy_queue_result_list, exec_time) if buy_progress_index is not None: - LCancelBigNumComputer().set_trade_progress(code, order_begin_pos.buy_single_index, buy_progress_index, + LCancelBigNumComputer().set_trade_progress(code, + order_begin_pos.buy_single_index, + buy_progress_index, l2.l2_data_util.local_today_datas.get( code)) @@ -424,7 +426,8 @@ state = trade_manager.CodesTradeStateManager().get_trade_state(code) if state == trade_constant.TRADE_STATE_BUY_PLACE_ORDER or state == trade_constant.TRADE_STATE_BUY_DELEGATED or state == trade_constant.TRADE_STATE_BUY_CANCEL_ING: try: - l2_data_manager_new.L2TradeDataProcessor.cancel_buy(code, "鎵嬪姩鎾ら攢", cancel_type=trade_constant.CANCEL_TYPE_HUMAN) + l2_data_manager_new.L2TradeDataProcessor.cancel_buy(code, "鎵嬪姩鎾ら攢", + cancel_type=trade_constant.CANCEL_TYPE_HUMAN) return_str = json.dumps({"code": 0}) except Exception as e: return_str = json.dumps({"code": 2, "msg": str(e)}) @@ -447,7 +450,7 @@ data = json.loads(_str) codes = data["data"]["codes"] for code in codes: - l2_trade_util.forbidden_trade(code, msg="鎵嬪姩鍔犲叆") + l2_trade_util.forbidden_trade(code, msg="鎵嬪姩鍔犲叆", force=True) name = gpcode_manager.get_code_name(code) if not name: results = HistoryKDatasUtils.get_gp_codes_names([code]) @@ -691,4 +694,4 @@ trade_manager.save_trade_success_data(fdatas) except: pass - time.sleep(1.5) \ No newline at end of file + time.sleep(1.5) -- Gitblit v1.8.0