Administrator
2025-04-08 2a1af722fe2e2575cfb82d4f108e89603dfc8096
添加日志
5个文件已修改
33 ■■■■■ 已修改文件
code_attribute/gpcode_manager.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
constant.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
servers/server.py 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
trade/current_price_process_manager.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
trade/l2_trade_util.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
code_attribute/gpcode_manager.py
@@ -9,7 +9,7 @@
from db.mysql_data_delegate import Mysqldb
from db.redis_manager_delegate import RedisUtils
from log_module import log_export
from log_module.log import logger_pre_close_price
from log_module.log import logger_pre_close_price, logger_debug
from utils import tool
import decimal
@@ -419,6 +419,7 @@
            # 获取交易窗口的锁
            cls.__instance.__forbidden_trade_codes_cache = RedisUtils.smembers(cls.__get_redis(),
                                                                               "forbidden-trade-codes")
            logger_debug.info(f"加载加黑列表:{cls.__instance.__forbidden_trade_codes_cache}")
        return cls.__instance
constant.py
@@ -234,6 +234,6 @@
IS_L2_NEW = True
# 是否可买首封
CAN_BUY_FIRST_LIMIT_UP = False
CAN_BUY_FIRST_LIMIT_UP = True
servers/server.py
@@ -22,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
@@ -258,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} "
@@ -276,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,
@@ -291,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))
@@ -421,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)})
@@ -444,7 +450,7 @@
                    data = json.loads(_str)
                    codes = data["data"]["codes"]
                    for code in codes:
                        l2_trade_util.forbidden_trade(code, msg="手动加入",force= true)
                        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])
@@ -688,4 +694,4 @@
                trade_manager.save_trade_success_data(fdatas)
        except:
            pass
        time.sleep(1.5)
        time.sleep(1.5)
trade/current_price_process_manager.py
@@ -66,7 +66,7 @@
        if len(result) > 2 and result[2]:
            # 可以拉黑
            if new_block_processor.is_can_forbidden(code):
                l2_trade_util.forbidden_trade(code, result[1])
                l2_trade_util.forbidden_trade(code, msg = result[1])
        return -1
    # 想买单
trade/l2_trade_util.py
@@ -21,7 +21,7 @@
# 添加代码到禁止交易
def add_to_forbidden_trade_codes(code):
def __add_to_forbidden_trade_codes(code):
    gpcode_manager.BlackListCodeManager().add_code(code)
@@ -42,7 +42,7 @@
    if need_add:
        if not is_in_forbidden_trade_codes(code):
            trade_record_log_util.add_forbidden_buy_log(code, msg)
        add_to_forbidden_trade_codes(code)
        __add_to_forbidden_trade_codes(code)
        async_log_util.warning(logger_trade, f"{code}加入黑名单原因:{msg}")