From e2a9507de7c912e622bec7e26df207237b4b0529 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 02 Jun 2026 10:02:22 +0800
Subject: [PATCH] refactor(okxNewPrice): 更新配置并优化网格交易初始化逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java | 169 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 117 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
index f020544..7169fe5 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateWebSocketClientManager.java
@@ -1,83 +1,148 @@
package com.xcong.excoin.modules.gateApi;
-import com.xcong.excoin.modules.okxNewPrice.OkxKlineWebSocketClient;
-import com.xcong.excoin.modules.okxNewPrice.OkxQuantWebSocketClient;
-import com.xcong.excoin.modules.okxNewPrice.celue.CaoZuoService;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.ExchangeInfoEnum;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListService;
-import com.xcong.excoin.utils.RedisUtils;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.AutoOrdersChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.CandlestickChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.OrdersChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionClosesChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.PositionsChannelHandler;
+import com.xcong.excoin.modules.gateApi.wsHandler.handler.UserTradesChannelHandler;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.math.BigDecimal;
/**
- * 管理多个OKX WebSocket客户端实例，每个实例对应一个账号
+ * Gate 模块 Spring 容器入口 — 组件组装 + 生命周期管理。
+ *
+ * <h3>组装顺序（{@code @PostConstruct}）</h3>
+ * <ol>
+ * <li>{@link GateConfig} — 构建配置（API 密钥、合约、策略参数）</li>
+ * <li>{@link GateGridTradeService} — init()：获取用户 ID → 切双向持仓 → 清旧条件单 → 平仓 → 设杠杆</li>
+ * <li>{@link GateKlineWebSocketClient} — 注册 6 个频道处理器 → init()：建立 WS 连接并订阅</li>
+ * <li>{@code gridTradeService.startGrid()} — 状态重置，等待首根 K 线</li>
+ * </ol>
+ *
+ * <h3>6 个频道处理器</h3>
+ * <ol>
+ * <li>CandlestickChannelHandler — 公开频道，K线 → onKline()</li>
+ * <li>PositionsChannelHandler — 私有频道，仓位 → onPositionUpdate()</li>
+ * <li>PositionClosesChannelHandler — 私有频道，平仓 → onPositionClose()</li>
+ * <li>OrdersChannelHandler — 私有频道，订单成交 → onOrderUpdate()</li>
+ * <li>UserTradesChannelHandler — 私有频道，用户成交 → onUserTrade()</li>
+ * <li>AutoOrdersChannelHandler — 私有频道，条件单状态 → onAutoOrder()</li>
+ * </ol>
+ *
+ * <h3>销毁顺序（{@code @PreDestroy}）</h3>
+ * <ol>
+ * <li>gridTradeService.stopGrid()：取消所有条件单 → 关闭交易线程池</li>
+ * <li>wsClient.destroy()：取消订阅 → 断开 WS → 关闭线程池</li>
+ * </ol>
+ *
+ * @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 GateConfig config;
-
- /**
- * 初始化方法，在Spring Bean构造完成后执行
- * 创建并初始化所有账号的WebSocket客户端实例
- */
@PostConstruct
public void init() {
- log.info("开始初始化OkxWebSocketClientManager");
-
- // 初始化价格WebSocket客户端
+ log.info("[管理器] 开始初始化...");
+
try {
- klinePriceClient = new GateKlineWebSocketClient(caoZuoService, this, wangGeListService);
- klinePriceClient.init();
- log.info("已初始化OkxNewPriceWebSocketClient");
+ //实盘
+ config = GateConfig.builder()
+ .apiKey("a2338398e00b7935104520e16be96918")
+ .apiSecret("9111d897f2346d5217619f2da76536632715fef4d7eb304c6c61e869a2a74e98")
+ .contract("ETH_USDT")
+ .leverage("100")
+ .marginMode("CROSS")
+ .positionMode("dual")
+ .gridRate(new BigDecimal("0.0025"))
+ .expectedProfit(new BigDecimal("2"))
+ .maxLoss(new BigDecimal("15"))
+ .quantity("1")
+ .priceScale(2)
+ .contractMultiplier(new BigDecimal("0.01"))
+ .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
+ .isProduction(true)
+ .reopenMaxRetries(3)
+ .build();
+// //测试盘
+// config = GateConfig.builder()
+// .apiKey("d90ca272391992b8e74f8f92cedb21ec")
+// .apiSecret("1861e4f52de4bb53369ea3208d9ede38ece4777368030f96c77d27934c46c274")
+// .contract("ETH_USDT")
+// .leverage("100")
+// .marginMode("CROSS")
+// .positionMode("dual")
+// .gridRate(new BigDecimal("0.002"))
+// .expectedProfit(new BigDecimal("1"))
+// .maxLoss(new BigDecimal("15"))
+// .quantity("1")
+// .priceScale(1)
+// .contractMultiplier(new BigDecimal("0.01"))
+// .unrealizedPnlPriceMode(GateConfig.PnLPriceMode.LAST_PRICE)
+// .isProduction(false)
+// .reopenMaxRetries(3)
+// .build();
+
+ // 1. 初始化交易服务：查用户ID → 切持仓模式 → 清条件单 → 平已有仓位 → 设杠杆
+ gridTradeService = new GateGridTradeService(config);
+ gridTradeService.init();
+
+ // 2. 创建 WS 客户端并注册 3 个频道处理器
+ 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.addChannelHandler(new OrdersChannelHandler(
+ config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
+ wsClient.addChannelHandler(new UserTradesChannelHandler(
+ config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
+ wsClient.addChannelHandler(new AutoOrdersChannelHandler(
+ config.getApiKey(), config.getApiSecret(), config.getContract(), gridTradeService));
+ wsClient.init();
+ log.info("[管理器] WS已连接, 已注册 6 个频道处理器");
+
+ // 3. 激活策略，等待首根 K 线触发基底双开
+ gridTradeService.startGrid();
} catch (Exception e) {
- log.error("初始化OkxNewPriceWebSocketClient失败", e);
+ log.error("[管理器] 初始化失败", e);
}
-
}
/**
- * 销毁方法，在Spring Bean销毁前执行
- * 关闭所有WebSocket客户端连接和相关资源
+ * 销毁：停止策略 → 关闭交易线程池 → 取消 WS 订阅 → 断开连接 → 关闭 WS 线程池。
*/
@PreDestroy
public void destroy() {
- log.info("开始销毁OkxWebSocketClientManager");
-
- // 关闭价格WebSocket客户端
- if (klinePriceClient != null) {
- try {
- klinePriceClient.destroy();
- log.info("已销毁OkxNewPriceWebSocketClient");
- } catch (Exception e) {
- log.error("销毁OkxNewPriceWebSocketClient失败", e);
- }
+ log.info("[管理器] 开始销毁...");
+ if (gridTradeService != null) {
+ gridTradeService.stopGrid();
}
-
- log.info("OkxWebSocketClientManager销毁完成");
+ if (wsClient != null) {
+ wsClient.destroy();
+ }
+ log.info("[管理器] 销毁完成");
}
/**
- * 获取OkxNewPriceWebSocketClient实例
- * @return 价格WebSocket客户端实例
+ * @return WebSocket 连接管理器实例
*/
- public GateKlineWebSocketClient getKlineWebSocketClient() {
- return klinePriceClient;
- }
-}
\ No newline at end of file
+ public GateKlineWebSocketClient getKlineWebSocketClient() { return wsClient; }
+ /**
+ * @return 网格交易策略服务实例
+ */
+ public GateGridTradeService getGridTradeService() { return gridTradeService; }
+}
--
Gitblit v1.9.1