fix(trade): 修复止盈订单数量设置和日志记录问题

Administrator

3 days ago c5f7e8303480a2b49c415d6d2e9c96bc4e159e52

 src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java

@@ -1,10 +1,9 @@
package com.xcong.excoin.modules.gateApi;

import com.xcong.excoin.modules.okxNewPrice.celue.CaoZuoService;
import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListService;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.CandlestickChannelHandler;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionClosesChannelHandler;
import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionsChannelHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;
@@ -12,77 +11,90 @@
import java.math.BigDecimal;

/**
 * 管理 Gate WebSocket 客户端和网格交易服务实例
 * Gate 模块 Spring 入口，组装所有组件并管理生命周期。
 *
 * <h3>启动流程 ({@code @PostConstruct})</h3>
 * <ol>
 *   <li>构建 {@link GateConfig}（Builder 模式，含 API 密钥、合约、策略参数）</li>
 *   <li>创建 {@link GateGridTradeService} → init()：切持仓模式、清旧条件单、设杠杆</li>
 *   <li>创建 {@link GateKlineWebSocketClient} → 注册 3 个 Handler → init()：建立 WS 连接</li>
 *   <li>gridTradeService.startGrid()：激活策略，等待 K 线触发首次双开</li>
 * </ol>
 *
 * <h3>销毁流程 ({@code @PreDestroy})</h3>
 * <ol>
 *   <li>gridTradeService.stopGrid()：取消条件单 → 关闭交易线程池</li>
 *   <li>wsClient.destroy()：取消订阅 → 断开 WS → 关闭线程池</li>
 * </ol>
 *
 * <h3>配置</h3>
 * 当前在代码中硬编码测试网参数。切换到生产网只需改为 {@code .isProduction(true)}。
 *
 * @author Administrator
 */
@Slf4j
@Component
public class GateWebSocketClientManager {
    @Autowired
    private CaoZuoService caoZuoService;
    @Autowired
    private RedisUtils redisUtils;
    @Autowired
    private WangGeListService wangGeListService;

    private GateKlineWebSocketClient klinePriceClient;
    /** WebSocket 连接管理器 */
    private GateKlineWebSocketClient wsClient;
    /** 网格交易策略服务 */
    private GateGridTradeService gridTradeService;

    private static final String API_KEY = "d90ca272391992b8e74f8f92cedb21ec";
    private static final String API_SECRET = "1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274";
    /** 统一配置 */
    private GateConfig config;

    @PostConstruct
    public void init() {
        log.info("开始初始化GateWebSocketClientManager");
        log.info("[管理器] 开始初始化...");

        try {
            gridTradeService = new GateGridTradeService(
                    API_KEY, API_SECRET,
                    "XAUT_USDT",
                    "100",
                    "cross",
                    new BigDecimal("0.0035"),
                    new BigDecimal("0.5"),
                    3,
                    new BigDecimal("7.5"),
                    "1"
            );
            config = GateConfig.builder()
                    .apiKey("d90ca272391992b8e74f8f92cedb21ec")
                    .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
                    .contract("ETH_USDT")
                    .leverage("100")
                    .marginMode("cross")
                    .positionMode("dual")
                    .gridRate(new BigDecimal("0.003"))
                    .overallTp(new BigDecimal("5"))
                    .maxLoss(new BigDecimal("15"))
                    .quantity("1")
                    .contractMultiplier(new BigDecimal("0.01"))
                    .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
                    .isProduction(false)
                    .reopenMaxRetries(3)
                    .build();

            gridTradeService = new GateGridTradeService(config);
            gridTradeService.init();

            klinePriceClient = new GateKlineWebSocketClient(caoZuoService, this, wangGeListService);
            klinePriceClient.setGridTradeService(gridTradeService);
            klinePriceClient.init();
            log.info("已初始化GateKlineWebSocketClient");
            wsClient = new GateKlineWebSocketClient(config.getWsUrl());
            wsClient.addChannelHandler(new CandlestickChannelHandler(config.getContract(), gridTradeService));
            wsClient.addChannelHandler(new PositionsChannelHandler(
                    config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
            wsClient.addChannelHandler(new PositionClosesChannelHandler(
                    config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
            wsClient.init();
            log.info("[管理器] WS已连接, 已注册 3 个频道处理器");

            gridTradeService.startGrid();
        } catch (Exception e) {
            log.error("初始化GateWebSocketClientManager失败", e);
            log.error("[管理器] 初始化失败", e);
        }
    }

    @PreDestroy
    public void destroy() {
        log.info("开始销毁GateWebSocketClientManager");

        log.info("[管理器] 开始销毁...");
        if (gridTradeService != null) {
            gridTradeService.stopGrid();
        }
        if (klinePriceClient != null) {
            try {
                klinePriceClient.destroy();
                log.info("已销毁GateKlineWebSocketClient");
            } catch (Exception e) {
                log.error("销毁GateKlineWebSocketClient失败", e);
            }
        if (wsClient != null) {
            wsClient.destroy();
        }

        log.info("GateWebSocketClientManager销毁完成");
        log.info("[管理器] 销毁完成");
    }

    public GateKlineWebSocketClient getKlineWebSocketClient() {
        return klinePriceClient;
    }

    public GateGridTradeService getGridTradeService() {
        return gridTradeService;
    }
}
    public GateKlineWebSocketClient getKlineWebSocketClient() { return wsClient; }
    public GateGridTradeService getGridTradeService() { return gridTradeService; }
}