From 4c8236f229ed903c861373ec3d8678062300ea6d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 04 Jun 2026 15:38:10 +0800
Subject: [PATCH] feat(ws): 添加WebSocket订阅状态追踪功能

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
index 2408486..f54cb94 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -146,6 +146,7 @@
     private volatile BigDecimal shortPositionSize = BigDecimal.ZERO;
     private Long userId;
     private volatile BigDecimal initialPrincipal = BigDecimal.ZERO;
+    private volatile GateKlineWebSocketClient wsClient;
 
     public GateGridTradeService(GateConfig config) {
         this.config = config;
@@ -376,6 +377,9 @@
 
         //初始化0位置的开仓,并且用空的开仓价格,作为价格基准来划分网格
         if (state == StrategyState.WAITING_KLINE) {
+            if (wsClient == null || !wsClient.areAllSubscribed()) {
+                return;
+            }
             state = StrategyState.OPENING;
             log.info("[Gate] 首根K线到达,开基底仓位 多空各{}张...", config.getBaseQuantity());
             executor.openLong(config.getBaseQuantity(), (orderId) -> {
@@ -924,7 +928,7 @@
                         triggerPrice,
                         FuturesPriceTrigger.RuleEnum.NUMBER_1,
                         ORDER_TYPE_CLOSE_SHORT,
-                        "1",
+                        config.getQuantity(),
                         profitId -> {
                             elem.setShortStopLossOrderId(profitId);
                             GridElement.refreshIndices();
@@ -944,7 +948,7 @@
                         triggerPrice,
                         FuturesPriceTrigger.RuleEnum.NUMBER_2,
                         ORDER_TYPE_CLOSE_LONG,
-                        "-1",
+                        negate(config.getQuantity()),
                         profitId -> {
                             elem.setLongStopLossOrderId(profitId);
                             GridElement.refreshIndices();
@@ -1673,4 +1677,6 @@
     public Long getUserId() { return userId; }
     /** @return 当前策略状态 */
     public StrategyState getState() { return state; }
+    /** 注入WS客户端,用于订阅状态检查 */
+    public void setWsClient(GateKlineWebSocketClient wsClient) { this.wsClient = wsClient; }
 }

--
Gitblit v1.9.1