From 3bcc6918c362a7837f792ef91018a1fe043096ef Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 12 May 2026 17:27:21 +0800
Subject: [PATCH] refactor(gateApi): 将条件单ID管理从单值改为集合支持批量操作
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 191 +++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 48 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 d0ca8f5..a2ec807 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -15,6 +15,10 @@
import java.util.Collections;
import java.util.List;
+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;
+
/**
* Gate 网格交易服务 — 策略核心。
*
@@ -102,6 +106,16 @@
private final List<BigDecimal> shortPriceQueue = Collections.synchronizedList(new ArrayList<>());
/** 多仓价格队列，升序排列（小→大），容量 gridQueueSize */
private final List<BigDecimal> longPriceQueue = Collections.synchronizedList(new ArrayList<>());
+
+ /** 多仓止盈队列，升序排列（小→大），仓位推送时消费 */
+ private final List<BigDecimal> longTakeProfitQueue = Collections.synchronizedList(new ArrayList<>());
+ /** 空仓止盈队列，降序排列（大→小），仓位推送时消费 */
+ private final List<BigDecimal> shortTakeProfitQueue = Collections.synchronizedList(new ArrayList<>());
+
+ /** 当前多仓条件单 ID 集合，用于取消旧单 */
+ private final List<String> currentLongOrderIds = Collections.synchronizedList(new ArrayList<>());
+ /** 当前空仓条件单 ID 集合，用于取消旧单 */
+ private final List<String> currentShortOrderIds = Collections.synchronizedList(new ArrayList<>());
/** 基底空头入场价 */
private BigDecimal shortBaseEntryPrice;
@@ -284,6 +298,10 @@
shortActive = false;
shortPriceQueue.clear();
longPriceQueue.clear();
+ longTakeProfitQueue.clear();
+ shortTakeProfitQueue.clear();
+ currentLongOrderIds.clear();
+ currentShortOrderIds.clear();
log.info("[Gate] 网格策略已启动");
}
@@ -340,8 +358,11 @@
if (state != StrategyState.ACTIVE) {
return;
}
- processShortGrid(closePrice);
- processLongGrid(closePrice);
+ if (!longPriceQueue.isEmpty() && closePrice.compareTo(longPriceQueue.get(0)) > 0) {
+ processLongGrid(closePrice);
+ } else if (!shortPriceQueue.isEmpty() && closePrice.compareTo(shortPriceQueue.get(0)) < 0) {
+ processShortGrid(closePrice);
+ }
}
// ---- 仓位推送回调 ----
@@ -385,14 +406,22 @@
log.info("[Gate] 基底多成交价: {}", longBaseEntryPrice);
tryGenerateQueues();
} else if (size.compareTo(longPositionSize) > 0) {
+ BigDecimal unitQty = new BigDecimal(config.getQuantity());
+ long prevUnits = longPositionSize.divide(unitQty, 0, RoundingMode.DOWN).longValue();
longPositionSize = size;
- if (longPriceQueue.isEmpty()) {
- log.warn("[Gate] 多仓队列为空，无法设止盈");
- } else {
- BigDecimal tpPrice = longPriceQueue.get(0);
+ long nowUnits = size.divide(unitQty, 0, RoundingMode.DOWN).longValue();
+ long newUnits = nowUnits - prevUnits;
+ for (int i = 0; i < newUnits; i++) {
+ BigDecimal tpPrice;
+ if (!longTakeProfitQueue.isEmpty()) {
+ tpPrice = longTakeProfitQueue.remove(0);
+ } else {
+ tpPrice = longEntryPrice.add(config.getStep()).setScale(1, RoundingMode.HALF_UP);
+ log.warn("[Gate] 多止盈队列为空, 兜底止盈价:{}", tpPrice);
+ }
executor.placeTakeProfit(tpPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_1, ORDER_TYPE_CLOSE_LONG, negate(config.getQuantity()));
- log.info("[Gate] 多单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, negate(config.getQuantity()));
+ log.info("[Gate] 多单止盈已设, tp:{}, size:{}", tpPrice, negate(config.getQuantity()));
}
} else {
longPositionSize = size;
@@ -412,14 +441,23 @@
log.info("[Gate] 基底空成交价: {}", shortBaseEntryPrice);
tryGenerateQueues();
} else if (size.abs().compareTo(shortPositionSize) > 0) {
- shortPositionSize = size.abs();
- if (shortPriceQueue.isEmpty()) {
- log.warn("[Gate] 空仓队列为空，无法设止盈");
- } else {
- BigDecimal tpPrice = shortPriceQueue.get(0);
+ BigDecimal unitQty = new BigDecimal(config.getQuantity());
+ long prevUnits = shortPositionSize.divide(unitQty, 0, RoundingMode.DOWN).longValue();
+ BigDecimal nowAbsSize = size.abs();
+ shortPositionSize = nowAbsSize;
+ long nowUnits = nowAbsSize.divide(unitQty, 0, RoundingMode.DOWN).longValue();
+ long newUnits = nowUnits - prevUnits;
+ for (int i = 0; i < newUnits; i++) {
+ BigDecimal tpPrice;
+ if (!shortTakeProfitQueue.isEmpty()) {
+ tpPrice = shortTakeProfitQueue.remove(0);
+ } else {
+ tpPrice = shortEntryPrice.subtract(config.getStep()).setScale(1, RoundingMode.HALF_UP);
+ log.warn("[Gate] 空止盈队列为空, 兜底止盈价:{}", tpPrice);
+ }
executor.placeTakeProfit(tpPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_2, ORDER_TYPE_CLOSE_SHORT, config.getQuantity());
- log.info("[Gate] 空单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, config.getQuantity());
+ log.info("[Gate] 空单止盈已设, tp:{}, size:{}", tpPrice, config.getQuantity());
}
} else {
shortPositionSize = size.abs();
@@ -470,10 +508,29 @@
if (baseLongOpened && baseShortOpened) {
generateShortQueue();
generateLongQueue();
+
+ BigDecimal step = config.getStep();
+ BigDecimal longTp = longPriceQueue.get(0).add(step).setScale(1, RoundingMode.HALF_UP);
+ BigDecimal shortTp = shortPriceQueue.get(0).subtract(step).setScale(1, RoundingMode.HALF_UP);
+ longTakeProfitQueue.add(longTp);
+ shortTakeProfitQueue.add(shortTp);
+ log.info("[Gate] 多止盈队列:{}", longTakeProfitQueue);
+ log.info("[Gate] 空止盈队列:{}", shortTakeProfitQueue);
+
+ executor.placeConditionalEntryOrder(longPriceQueue.get(0),
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+ orderId -> { currentLongOrderIds.add(orderId); log.info("[Gate] 初始条件多单已挂, id:{}, trigger:{}", orderId, longPriceQueue.get(0)); },
+ null);
+ executor.placeConditionalEntryOrder(shortPriceQueue.get(0),
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+ orderId -> { currentShortOrderIds.add(orderId); log.info("[Gate] 初始条件空单已挂, id:{}, trigger:{}", orderId, shortPriceQueue.get(0)); },
+ null);
+
state = StrategyState.ACTIVE;
- log.info("[Gate] 网格队列已生成, 空队首:{} → 尾:{}, 多队首:{} → 尾:{}, 已激活",
+ log.info("[Gate] 网格队列已生成, 空队首:{} → 尾:{}, 多队首:{} → 尾:{}, step:{}, 已激活",
shortPriceQueue.get(0), shortPriceQueue.get(shortPriceQueue.size() - 1),
- longPriceQueue.get(0), longPriceQueue.get(longPriceQueue.size() - 1));
+ longPriceQueue.get(0), longPriceQueue.get(longPriceQueue.size() - 1),
+ step);
}
}
@@ -559,9 +616,7 @@
shortPriceQueue.add(min);
log.info("[Gate] 空队列增加:{}", min);
}
-
shortPriceQueue.sort((a, b) -> b.compareTo(a));
-
log.info("[Gate] 现空队列:{}", shortPriceQueue);
}
@@ -570,11 +625,6 @@
BigDecimal gridStep = config.getStep();
for (int i = 1; i <= matched.size(); i++) {
BigDecimal elem = first.subtract(gridStep.multiply(BigDecimal.valueOf(i))).setScale(1, RoundingMode.HALF_UP);
-// if (longEntryPrice.compareTo(BigDecimal.ZERO) > 0
-// && currentPrice.subtract(longEntryPrice).abs().compareTo(longEntryPrice.multiply(config.getGridRate())) < 0) {
-// log.info("[Gate] 多队列跳过(price≈longEntry):{}", elem);
-// continue;
-// }
longPriceQueue.add(elem);
log.info("[Gate] 多队列增加:{}", elem);
}
@@ -585,19 +635,45 @@
log.info("[Gate] 现多队列:{}", longPriceQueue);
}
+ BigDecimal newShortFirst = shortPriceQueue.get(0);
+ BigDecimal newLongFirst = longPriceQueue.get(0);
+ BigDecimal step = config.getStep();
+ BigDecimal stpElem = newShortFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
+ shortTakeProfitQueue.add(stpElem);
+ shortTakeProfitQueue.sort((a, b) -> b.compareTo(a));
+ log.info("[Gate] 空止盈队列增加:{}, 现止盈队列:{}", stpElem, shortTakeProfitQueue);
+
if (!isMarginSafe()) {
- log.warn("[Gate] 保证金超限，跳过空单开仓");
+ log.warn("[Gate] 保证金超限，跳过挂条件单");
} else {
- executor.openShort(negate(config.getQuantity()), null, null);
- if (shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(shortEntryPrice) > 0
- && currentPrice.compareTo(shortEntryPrice) > 0
- && currentPrice.compareTo(longEntryPrice.multiply(BigDecimal.ONE.subtract(config.getGridRate()))) < 0) {
- executor.openLong(config.getQuantity(), null, null);
- log.info("[Gate] 触发价在多/空持仓价之间且多>空且远离多仓均价, 额外开多一次, 当前价:{}", currentPrice);
+ synchronized (currentLongOrderIds) {
+ for (String id : currentLongOrderIds) {
+ executor.cancelConditionalOrder(id);
+ }
+ currentLongOrderIds.clear();
+ }
+ executor.placeConditionalEntryOrder(newShortFirst,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+ orderId -> { currentShortOrderIds.add(orderId); log.info("[Gate] 新条件空单, id:{}, trigger:{}", orderId, newShortFirst); },
+ null);
+ executor.placeConditionalEntryOrder(newLongFirst,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+ orderId -> { currentLongOrderIds.add(orderId); log.info("[Gate] 新条件多单, id:{}, trigger:{}", orderId, newLongFirst); },
+ null);
+
+ if (newShortFirst.compareTo(shortEntryPrice) > 0
+ && newShortFirst.compareTo(longEntryPrice) < 0) {
+ BigDecimal reverseLongTp = newShortFirst.add(step).setScale(1, RoundingMode.HALF_UP);
+ longTakeProfitQueue.add(reverseLongTp);
+ longTakeProfitQueue.sort(BigDecimal::compareTo);
+ executor.placeConditionalEntryOrder(newShortFirst,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+ orderId -> { currentLongOrderIds.add(orderId); },
+ null);
+ log.info("[Gate] 反向条件多单已挂, trigger:{}, size:{}, 止盈:{}", newShortFirst, config.getQuantity(), reverseLongTp);
}
}
+
}
/**
@@ -632,7 +708,7 @@
}
log.info("[Gate] 原多队列:{}", longPriceQueue);
if (matched.isEmpty()) {
- log.info("[Gate] 多仓队列未触发, 当前价:{}", currentPrice);
+ log.info("[Gate] 多仓队列未触发, 当前价:{}", currentPrice);
return;
}
@@ -645,11 +721,9 @@
for (int i = 0; i < matched.size(); i++) {
max = max.add(gridStep).setScale(1, RoundingMode.HALF_UP);
longPriceQueue.add(max);
-
log.info("[Gate] 多队列增加:{}", max);
}
longPriceQueue.sort(BigDecimal::compareTo);
-
log.info("[Gate] 现多队列:{}", longPriceQueue);
}
@@ -658,11 +732,6 @@
BigDecimal gridStep = config.getStep();
for (int i = 1; i <= matched.size(); i++) {
BigDecimal elem = first.add(gridStep.multiply(BigDecimal.valueOf(i))).setScale(1, RoundingMode.HALF_UP);
-// if (shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
-// && currentPrice.subtract(shortEntryPrice).abs().compareTo(shortEntryPrice.multiply(config.getGridRate())) < 0) {
-// log.info("[Gate] 空队列跳过(price≈shortEntry):{}", elem);
-// continue;
-// }
shortPriceQueue.add(elem);
log.info("[Gate] 空队列增加:{}", elem);
}
@@ -673,19 +742,45 @@
log.info("[Gate] 现空队列:{}", shortPriceQueue);
}
+ BigDecimal newLongFirst = longPriceQueue.get(0);
+ BigDecimal newShortFirst = shortPriceQueue.get(0);
+ BigDecimal step = config.getStep();
+ BigDecimal ltpElem = newLongFirst.add(step).setScale(1, RoundingMode.HALF_UP);
+ longTakeProfitQueue.add(ltpElem);
+ longTakeProfitQueue.sort(BigDecimal::compareTo);
+ log.info("[Gate] 多止盈队列增加:{}, 现止盈队列:{}", ltpElem, longTakeProfitQueue);
+
if (!isMarginSafe()) {
- log.warn("[Gate] 保证金超限，跳过多单开仓");
+ log.warn("[Gate] 保证金超限，跳过挂条件单");
} else {
- executor.openLong(config.getQuantity(), null, null);
- if (shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
- && longEntryPrice.compareTo(shortEntryPrice) > 0
- && currentPrice.compareTo(shortEntryPrice.multiply(BigDecimal.ONE.add(config.getGridRate()))) > 0
- && currentPrice.compareTo(longEntryPrice) < 0) {
- executor.openShort(negate(config.getQuantity()), null, null);
- log.info("[Gate] 触发价在多/空持仓价之间且多>空且远离空仓均价, 额外开空一次, 当前价:{}", currentPrice);
+ synchronized (currentShortOrderIds) {
+ for (String id : currentShortOrderIds) {
+ executor.cancelConditionalOrder(id);
+ }
+ currentShortOrderIds.clear();
+ }
+ executor.placeConditionalEntryOrder(newLongFirst,
+ FuturesPriceTrigger.RuleEnum.NUMBER_1, config.getQuantity(),
+ orderId -> { currentLongOrderIds.add(orderId); log.info("[Gate] 新条件多单, id:{}, trigger:{}", orderId, newLongFirst); },
+ null);
+ executor.placeConditionalEntryOrder(newShortFirst,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+ orderId -> { currentShortOrderIds.add(orderId); log.info("[Gate] 新条件空单, id:{}, trigger:{}", orderId, newShortFirst); },
+ null);
+
+ if (newLongFirst.compareTo(shortEntryPrice) > 0
+ && newLongFirst.compareTo(longEntryPrice) < 0) {
+ BigDecimal reverseShortTp = newLongFirst.subtract(step).setScale(1, RoundingMode.HALF_UP);
+ shortTakeProfitQueue.add(reverseShortTp);
+ shortTakeProfitQueue.sort((a, b) -> b.compareTo(a));
+ executor.placeConditionalEntryOrder(newLongFirst,
+ FuturesPriceTrigger.RuleEnum.NUMBER_2, negate(config.getQuantity()),
+ orderId -> { currentShortOrderIds.add(orderId); },
+ null);
+ log.info("[Gate] 反向条件空单已挂, trigger:{}, size:{}, 止盈:{}", newLongFirst, negate(config.getQuantity()), reverseShortTp);
}
}
+
}
// ---- 保证金安全阀 ----
--
Gitblit v1.9.1