From 991e53d56e45094ca8e0db9685559bb71a015d2c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 12 May 2026 16:11:26 +0800
Subject: [PATCH] feat(gateApi): 实现网格交易止盈队列和限价单管理功能
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 344 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 281 insertions(+), 63 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 5710e88..e791e63 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -103,6 +103,16 @@
/** 多仓价格队列，升序排列（小→大），容量 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 volatile String currentLongOrderId;
+ /** 当前空仓限价单 ID，用于取消旧单 */
+ private volatile String currentShortOrderId;
+
/** 基底空头入场价 */
private BigDecimal shortBaseEntryPrice;
/** 基底多头入场价 */
@@ -139,6 +149,20 @@
// ---- 初始化 ----
+ /**
+ * 初始化策略环境。
+ *
+ * <h3>执行顺序</h3>
+ * <ol>
+ * <li>获取用户 ID（用于私有频道订阅 payload）</li>
+ * <li>获取账户信息 → 记录初始本金</li>
+ * <li>如需要，切换为双向持仓模式</li>
+ * <li>如需要，调整持仓模式（single/dual）</li>
+ * <li>清除旧的止盈止损条件单</li>
+ * <li>平掉所有已有仓位</li>
+ * <li>设置杠杆倍数</li>
+ * </ol>
+ */
public void init() {
try {
ApiClient detailClient = new ApiClient();
@@ -194,6 +218,19 @@
}
}
+ /**
+ * 平掉当前合约的所有已有仓位。
+ *
+ * <h3>平仓策略</h3>
+ * <ul>
+ * <li>单向持仓：size=相反数，reduceOnly=true，市价 IOC 平仓</li>
+ * <li>双向持仓：size=0，close=false，autoSize=LONG/SHORT，reduceOnly=true，市价 IOC 全平</li>
+ * </ul>
+ *
+ * <h3>注意事项</h3>
+ * 双向持仓模式下必须使用 autoSize 参数，不能直接传负数 size，
+ * 否则 Gate API 会拒绝（双向模式下空头 size 为负是正常的持仓方向）。
+ */
private void closeExistingPositions() {
try {
List<Position> positions = futuresApi.listPositions(SETTLE).execute();
@@ -234,6 +271,10 @@
// ---- 启动/停止 ----
+ /**
+ * 启动网格策略。重置所有状态变量和队列，进入 WAITING_KLINE 等待首根 K 线。
+ * 仅当当前状态为 WAITING_KLINE 或 STOPPED 时才允许启动。
+ */
public void startGrid() {
if (state != StrategyState.WAITING_KLINE && state != StrategyState.STOPPED) {
log.warn("[Gate] 策略已在运行中, state:{}", state);
@@ -253,9 +294,17 @@
shortActive = false;
shortPriceQueue.clear();
longPriceQueue.clear();
+ longTakeProfitQueue.clear();
+ shortTakeProfitQueue.clear();
+ currentLongOrderId = null;
+ currentShortOrderId = null;
log.info("[Gate] 网格策略已启动");
}
+ /**
+ * 停止网格策略。取消所有条件单 → 关闭交易线程池。
+ * 状态设为 STOPPED，K 线回调将直接返回不再处理。
+ */
public void stopGrid() {
state = StrategyState.STOPPED;
executor.cancelAllPriceTriggeredOrders();
@@ -265,6 +314,24 @@
// ---- K线回调 ----
+ /**
+ * K 线回调入口。由 {@link CandlestickChannelHandler} 在收到 WebSocket K 线推送时调用。
+ *
+ * <h3>处理流程</h3>
+ * <ol>
+ * <li>更新 lastKlinePrice → 计算 unrealizedPnl（浮动盈亏）</li>
+ * <li>STOPPED → 直接返回（仅保留盈亏更新）</li>
+ * <li>WAITING_KLINE → 切换为 OPENING → 异步提交基底双开（开多+开空）</li>
+ * <li>OPENING → 等待仓位推送回调生成队列，此处返回</li>
+ * <li>ACTIVE → 执行 processShortGrid + processLongGrid</li>
+ * </ol>
+ *
+ * <h3>注意</h3>
+ * 基底双开下单提交到 GateTradeExecutor 的独立线程池中异步执行，
+ * 成交状态由 onPositionUpdate 回调驱动，不阻塞 WS 回调线程。
+ *
+ * @param closePrice K 线收盘价（即当前最新成交价）
+ */
public void onKline(BigDecimal closePrice) {
lastKlinePrice = closePrice;
updateUnrealizedPnl();
@@ -287,12 +354,35 @@
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);
+ }
}
// ---- 仓位推送回调 ----
+ /**
+ * 仓位推送回调。由 {@link PositionsChannelHandler} 在收到 WebSocket 仓位更新时调用。
+ *
+ * <h3>处理逻辑</h3>
+ * <ul>
+ * <li><b>有仓位 (size ≠ 0)</b>：
+ * <ul>
+ * <li>首次开仓（基底）：标记 baseOpened=true，记录基底入场价，双基底都成交后生成网格队列</li>
+ * <li>仓位净增加（size > 之前记录值）：说明网格触发了新开仓 → 取对应方向队列首元素为止盈价，设止盈条件单</li>
+ * <li>仓位减少或不变（止盈平仓后）：仅更新 positionSize，不重复设止盈</li>
+ * </ul>
+ * </li>
+ * <li><b>无仓位 (size = 0)</b>：清空活跃标记和持仓量</li>
+ * </ul>
+ *
+ * @param contract 合约名称
+ * @param mode 持仓模式（DUAL_LONG / DUAL_SHORT）
+ * @param size 持仓张数（多头为正、空头为负）
+ * @param entryPrice 当前持仓加权均价（交易所计算）
+ */
public void onPositionUpdate(String contract, Position.ModeEnum mode, BigDecimal size,
BigDecimal entryPrice) {
if (state == StrategyState.STOPPED || state == StrategyState.WAITING_KLINE) {
@@ -312,11 +402,23 @@
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;
- BigDecimal tpPrice = entryPrice.multiply(BigDecimal.ONE.add(config.getGridRate())).setScale(1, RoundingMode.HALF_UP);
- 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()));
+ 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] 多单止盈已设, tp:{}, size:{}", tpPrice, negate(config.getQuantity()));
+ }
} else {
longPositionSize = size;
}
@@ -335,11 +437,24 @@
log.info("[Gate] 基底空成交价: {}", shortBaseEntryPrice);
tryGenerateQueues();
} else if (size.abs().compareTo(shortPositionSize) > 0) {
- shortPositionSize = size.abs();
- BigDecimal tpPrice = entryPrice.multiply(BigDecimal.ONE.subtract(config.getGridRate())).setScale(1, RoundingMode.HALF_UP);
- executor.placeTakeProfit(tpPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2, ORDER_TYPE_CLOSE_SHORT, config.getQuantity());
- log.info("[Gate] 空单止盈已设, entry:{}, tp:{}, size:{}", entryPrice, tpPrice, config.getQuantity());
+ 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] 空单止盈已设, tp:{}, size:{}", tpPrice, config.getQuantity());
+ }
} else {
shortPositionSize = size.abs();
}
@@ -352,6 +467,17 @@
// ---- 平仓推送回调 ----
+ /**
+ * 平仓推送回调。由 {@link PositionClosesChannelHandler} 在收到平仓推送时调用。
+ *
+ * <h3>累加规则</h3>
+ * cumulativePnl += pnl。止盈平仓时 pnl > 0，止损平仓时 pnl < 0。
+ * 累加后检查停止条件：≥ overallTp 或 ≤ -maxLoss。
+ *
+ * @param contract 合约名称
+ * @param side 平仓方向（"long" / "short"）
+ * @param pnl 本次平仓的盈亏金额
+ */
public void onPositionClose(String contract, String side, BigDecimal pnl) {
if (state == StrategyState.STOPPED) {
return;
@@ -370,33 +496,69 @@
// ---- 网格队列处理 ----
+ /**
+ * 尝试生成网格队列。双基底（多+空）都成交后才触发：
+ * 生成空仓队列 + 多仓队列 → 状态切换为 ACTIVE。
+ */
private void tryGenerateQueues() {
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.placeGridLimitOrder(longPriceQueue.get(0), config.getQuantity(),
+ orderId -> { currentLongOrderId = orderId; log.info("[Gate] 初始限价多单已挂, id:{}", orderId); },
+ null);
+ executor.placeGridLimitOrder(shortPriceQueue.get(0), negate(config.getQuantity()),
+ orderId -> { currentShortOrderId = orderId; log.info("[Gate] 初始限价空单已挂, id:{}", orderId); },
+ 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);
}
}
+ /**
+ * 生成空仓价格队列。
+ * 以 shortBaseEntryPrice × gridRate 作为绝对步长 step，存到 config。
+ * 第1个元素 = shortBaseEntryPrice − step，后续依次递减 step，共 gridQueueSize 个。
+ * 队列降序排列（大→小），方便 processShortGrid 中从头遍历。
+ */
private void generateShortQueue() {
shortPriceQueue.clear();
- BigDecimal step = config.getGridRate();
- for (int i = 1; i <= config.getGridQueueSize(); i++) {
- shortPriceQueue.add(shortBaseEntryPrice.multiply(BigDecimal.ONE.subtract(step.multiply(BigDecimal.valueOf(i)))).setScale(1, RoundingMode.HALF_UP));
+ BigDecimal step = shortBaseEntryPrice.multiply(config.getGridRate()).setScale(1, RoundingMode.HALF_UP);
+ config.setStep(step);
+ BigDecimal elem = shortBaseEntryPrice.subtract(step).setScale(1, RoundingMode.HALF_UP);
+ for (int i = 0; i < config.getGridQueueSize(); i++) {
+ shortPriceQueue.add(elem);
+ elem = elem.subtract(step).setScale(1, RoundingMode.HALF_UP);
}
shortPriceQueue.sort((a, b) -> b.compareTo(a));
- //输出队列：shortPriceQueue;
log.info("[Gate] 空队列:{}", shortPriceQueue);
}
+ /**
+ * 生成多仓价格队列。
+ * 以 shortBaseEntryPrice + step 为首元素，后续依次递增 step，共 gridQueueSize 个。
+ * 队列升序排列（小→大），方便 processLongGrid 中从头遍历。
+ */
private void generateLongQueue() {
longPriceQueue.clear();
- BigDecimal step = config.getGridRate();
- for (int i = 1; i <= config.getGridQueueSize(); i++) {
- longPriceQueue.add(longBaseEntryPrice.multiply(BigDecimal.ONE.add(step.multiply(BigDecimal.valueOf(i)))).setScale(1, RoundingMode.HALF_UP));
+ BigDecimal step = config.getStep();
+ BigDecimal elem = shortBaseEntryPrice.add(step).setScale(1, RoundingMode.HALF_UP);
+ for (int i = 0; i < config.getGridQueueSize(); i++) {
+ longPriceQueue.add(elem);
+ elem = elem.add(step).setScale(1, RoundingMode.HALF_UP);
}
longPriceQueue.sort(BigDecimal::compareTo);
log.info("[Gate] 多队列:{}", longPriceQueue);
@@ -412,10 +574,10 @@
* <h3>执行流程</h3>
* <ol>
* <li>匹配队列元素 → 为空则直接返回</li>
+ * <li>空仓队列：移除 matched 元素，尾部补充新元素（尾价 − step 循环递减）</li>
+ * <li>多仓队列：以多仓队列首元素（最小价）为种子，递减 step 生成 matched.size() 个元素加入</li>
* <li>保证金检查 → 安全则开空一次</li>
* <li>额外反向开多：若多仓均价 > 空仓均价 且 当前价夹在中间且远离多仓均价</li>
- * <li>空仓队列：移除 matched 元素，尾部补充新元素（尾价 × (1 − gridRate) 循环递减）</li>
- * <li>多仓队列：以多仓队列首元素（最小价）为种子，生成 matched.size() 个递减元素加入</li>
* </ol>
*
* <h3>多仓队列转移过滤</h3>
@@ -438,40 +600,25 @@
return;
}
log.info("[Gate] 空仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
- if (!isMarginSafe()) {
- 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 (shortPriceQueue) {
shortPriceQueue.removeAll(matched);
BigDecimal min = shortPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : shortPriceQueue.get(shortPriceQueue.size() - 1);
- BigDecimal step = config.getGridRate();
+ BigDecimal gridStep = config.getStep();
for (int i = 0; i < matched.size(); i++) {
- min = min.multiply(BigDecimal.ONE.subtract(step)).setScale(1, RoundingMode.HALF_UP);
+ min = min.subtract(gridStep).setScale(1, RoundingMode.HALF_UP);
shortPriceQueue.add(min);
log.info("[Gate] 空队列增加:{}", min);
}
-
shortPriceQueue.sort((a, b) -> b.compareTo(a));
-
log.info("[Gate] 现空队列:{}", shortPriceQueue);
}
synchronized (longPriceQueue) {
BigDecimal first = longPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : longPriceQueue.get(0);
- BigDecimal step = config.getGridRate();
+ BigDecimal gridStep = config.getStep();
for (int i = 1; i <= matched.size(); i++) {
- BigDecimal elem = first.multiply(BigDecimal.ONE.subtract(step.multiply(BigDecimal.valueOf(i)))).setScale(1, RoundingMode.HALF_UP);
+ BigDecimal elem = first.subtract(gridStep.multiply(BigDecimal.valueOf(i))).setScale(1, RoundingMode.HALF_UP);
longPriceQueue.add(elem);
log.info("[Gate] 多队列增加:{}", elem);
}
@@ -480,6 +627,37 @@
longPriceQueue.remove(longPriceQueue.size() - 1);
}
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] 保证金超限，跳过挂限价单");
+ } else {
+ String oldLongId = currentLongOrderId;
+ executor.cancelOrder(oldLongId);
+ executor.placeGridLimitOrder(newShortFirst, negate(config.getQuantity()),
+ orderId -> { currentShortOrderId = orderId; log.info("[Gate] 新限价空单, id:{}, price:{}", orderId, newShortFirst); },
+ null);
+ executor.placeGridLimitOrder(newLongFirst, config.getQuantity(),
+ orderId -> { currentLongOrderId = orderId; log.info("[Gate] 新限价多单, id:{}, price:{}", orderId, newLongFirst); },
+ null);
+ }
+
+ if (isMarginSafe()
+ && shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(shortEntryPrice) > 0
+ && currentPrice.compareTo(shortEntryPrice) > 0
+ && currentPrice.compareTo(longEntryPrice) < 0) {
+ executor.openLong(config.getQuantity(), null, null);
+ log.info("[Gate] 额外反向开多, 当前价:{} 在[{},{}]之间", currentPrice, shortEntryPrice, longEntryPrice);
}
}
@@ -493,10 +671,10 @@
* <h3>执行流程</h3>
* <ol>
* <li>匹配队列元素 → 为空则直接返回</li>
+ * <li>多仓队列：移除 matched 元素，尾部补充新元素（尾价 + step 循环递增）</li>
+ * <li>空仓队列：以空仓队列首元素（最高价）为种子，递增 step 生成 matched.size() 个元素加入</li>
* <li>保证金检查 → 安全则开多一次</li>
* <li>额外反向开空：若多仓均价 > 空仓均价 且 当前价夹在中间且远离空仓均价</li>
- * <li>多仓队列：移除 matched 元素，尾部补充新元素（尾价 × (1 + gridRate) 循环递增）</li>
- * <li>空仓队列：以空仓队列首元素（最高价）为种子，生成 matched.size() 个递增元素加入</li>
* </ol>
*
* <h3>空仓队列转移过滤</h3>
@@ -515,45 +693,30 @@
}
log.info("[Gate] 原多队列:{}", longPriceQueue);
if (matched.isEmpty()) {
- log.info("[Gate] 多仓队列未触发, 当前价:{}", currentPrice);
+ log.info("[Gate] 多仓队列未触发, 当前价:{}", currentPrice);
return;
}
log.info("[Gate] 多仓队列触发, 匹配{}个元素, 当前价:{}", matched.size(), currentPrice);
- if (!isMarginSafe()) {
- 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 (longPriceQueue) {
longPriceQueue.removeAll(matched);
BigDecimal max = longPriceQueue.isEmpty() ? matched.get(matched.size() - 1) : longPriceQueue.get(longPriceQueue.size() - 1);
- BigDecimal step = config.getGridRate();
+ BigDecimal gridStep = config.getStep();
for (int i = 0; i < matched.size(); i++) {
- max = max.multiply(BigDecimal.ONE.add(step)).setScale(1, RoundingMode.HALF_UP);
+ max = max.add(gridStep).setScale(1, RoundingMode.HALF_UP);
longPriceQueue.add(max);
-
log.info("[Gate] 多队列增加:{}", max);
}
longPriceQueue.sort(BigDecimal::compareTo);
-
log.info("[Gate] 现多队列:{}", longPriceQueue);
}
synchronized (shortPriceQueue) {
BigDecimal first = shortPriceQueue.isEmpty() ? matched.get(0) : shortPriceQueue.get(0);
- BigDecimal step = config.getGridRate();
+ BigDecimal gridStep = config.getStep();
for (int i = 1; i <= matched.size(); i++) {
- BigDecimal elem = first.multiply(BigDecimal.ONE.add(step.multiply(BigDecimal.valueOf(i)))).setScale(1, RoundingMode.HALF_UP);
+ BigDecimal elem = first.add(gridStep.multiply(BigDecimal.valueOf(i))).setScale(1, RoundingMode.HALF_UP);
shortPriceQueue.add(elem);
log.info("[Gate] 空队列增加:{}", elem);
}
@@ -563,10 +726,51 @@
}
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] 保证金超限，跳过挂限价单");
+ } else {
+ String oldShortId = currentShortOrderId;
+ executor.cancelOrder(oldShortId);
+ executor.placeGridLimitOrder(newLongFirst, config.getQuantity(),
+ orderId -> { currentLongOrderId = orderId; log.info("[Gate] 新限价多单, id:{}, price:{}", orderId, newLongFirst); },
+ null);
+ executor.placeGridLimitOrder(newShortFirst, negate(config.getQuantity()),
+ orderId -> { currentShortOrderId = orderId; log.info("[Gate] 新限价空单, id:{}, price:{}", orderId, newShortFirst); },
+ null);
+ }
+
+ if (isMarginSafe()
+ && shortEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(BigDecimal.ZERO) > 0
+ && longEntryPrice.compareTo(shortEntryPrice) > 0
+ && currentPrice.compareTo(shortEntryPrice) > 0
+ && currentPrice.compareTo(longEntryPrice) < 0) {
+ executor.openShort(negate(config.getQuantity()), null, null);
+ log.info("[Gate] 额外反向开空, 当前价:{} 在[{},{}]之间", currentPrice, shortEntryPrice, longEntryPrice);
+ }
}
// ---- 保证金安全阀 ----
+ /**
+ * 保证金安全阀检查。
+ *
+ * <p>实时查询当前保证金占用额（positionInitialMargin），计算其占初始本金的比例。
+ * 比例 ≥ marginRatioLimit（默认 20%）时拒绝开仓，但仍照常更新队列。
+ *
+ * <p>查询失败时默认放行（返回 true），避免因 REST API 异常导致策略完全停滞。
+ *
+ * @return true=安全可开仓 / false=保证金超限跳过开仓
+ */
private boolean isMarginSafe() {
try {
FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
@@ -582,6 +786,10 @@
// ---- 工具 ----
+ /**
+ * 取反字符串数字。如 "1" → "-1"，"-2" → "2"。
+ * 用于开空单时将正数张数转为负数。
+ */
private String negate(String qty) {
return qty.startsWith("-") ? qty.substring(1) : "-" + qty;
}
@@ -617,6 +825,9 @@
/**
* 根据配置的 PnLPriceMode 返回计价价格。
+ * MARK_PRICE 模式优先使用标记价格（外部注入），未注入时回退到最新成交价。
+ *
+ * @return 计价价格，可能为 null
*/
private BigDecimal resolvePnlPrice() {
if (config.getUnrealizedPnlPriceMode() == GateConfig.PnLPriceMode.MARK_PRICE
@@ -626,11 +837,18 @@
return lastKlinePrice;
}
+ /** @return 最新 K 线价格（每次 onKline 更新） */
public BigDecimal getLastKlinePrice() { return lastKlinePrice; }
+ /** 设置标记价格（外部注入，MARK_PRICE 模式时用于盈亏计算） */
public void setMarkPrice(BigDecimal markPrice) { this.markPrice = markPrice; }
+ /** @return 策略是否处于活跃状态（非 STOPPED 且非 WAITING_KLINE） */
public boolean isStrategyActive() { return state != StrategyState.STOPPED && state != StrategyState.WAITING_KLINE; }
+ /** @return 累计已实现盈亏（平仓推送驱动累加） */
public BigDecimal getCumulativePnl() { return cumulativePnl; }
+ /** @return 当前未实现盈亏（每根 K 线实时计算） */
public BigDecimal getUnrealizedPnl() { return unrealizedPnl; }
+ /** @return Gate 用户 ID（用于私有频道订阅 payload） */
public Long getUserId() { return userId; }
+ /** @return 当前策略状态 */
public StrategyState getState() { return state; }
}
--
Gitblit v1.9.1