From fb3ca9d6745139d4f8f005a07b6de01db9718e20 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 24 Jul 2026 11:41:24 +0800
Subject: [PATCH] refactor(gateApi): 优化网格交易服务逻辑并移除调试日志
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 211 +++++++++++++++++++++++++++++-----------------------
1 files changed, 116 insertions(+), 95 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 c640610..4292f7c 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -135,6 +135,9 @@
/** 多头是否活跃（有仓位） */
private volatile boolean longActive = false;
+ /** 当前已完成轮数，每次盈利重启时+1 */
+ private volatile int currentRound = 0;
+
/** 多头累计止损次数（始终递增，加仓订单成交后归零） */
private volatile int accumulatedLongLossCount = 0;
/** 空头累计止损次数（始终递增，加仓订单成交后归零） */
@@ -322,6 +325,7 @@
currentShortOrderIds.clear();
// 每次重启重新获取当前本金
refreshInitialPrincipal();
+ currentRound = 0;
log.info("[Gate] 网格策略已启动, 当前本金: {} USDT", initialPrincipal);
}
@@ -432,7 +436,17 @@
BigDecimal totalEquity = new BigDecimal(account.getTotal()).add(new BigDecimal(account.getUnrealisedPnl()));
if (totalEquity.compareTo(target) > 0) {
- log.info("[Gate] 盈亏达标(净权益{}>目标{})，重置策略", totalEquity, target);
+ currentRound++;
+ int maxRounds = config.getRounds();
+ log.info("[Gate] 盈亏达标(净权益{}>目标{})，第{}轮完成", totalEquity, target, currentRound);
+
+ if (maxRounds > 0 && currentRound >= maxRounds) {
+ log.info("[Gate] 已达到运行轮数上限({})，策略停止", maxRounds);
+ stopGrid();
+ return;
+ }
+
+ log.info("[Gate] 重置策略，开始第{}轮...", currentRound);
state = StrategyState.STOPPED;
try {
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
@@ -443,7 +457,10 @@
// 提交到 executor 末尾：单线程FIFO保证前面所有平仓/取消任务完成后才重置
executor.submitTask(() -> {
try { Thread.sleep(3000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
+ // 注意：startGrid() 会将 currentRound 归零，这里需要保留
+ int savedRound = currentRound;
startGrid();
+ currentRound = savedRound;
});
}
} catch (Exception e) {
@@ -542,7 +559,9 @@
// 提交到 executor 末尾：单线程FIFO保证前面所有平仓/取消任务完成后才重置
executor.submitTask(() -> {
try { Thread.sleep(3000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
+ int savedRound = currentRound;
startGrid();
+ currentRound = savedRound;
});
log.info("[Gate] 重置策略");
return;
@@ -605,16 +624,16 @@
GridElement longTpElem = GridElement.findByLongTakeProfitOrderId(orderId);
if (longTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
longTakeProfitTraderIdParam(longTpElem, null, false);
- log.info("[Gate] 多仓止盈触发 gridId:{}, orderId:{}", longTpElem.getId(), orderId);
- cancelNearestLongStopLoss();
+// log.info("[Gate] 多仓止盈触发 gridId:{}, orderId:{}", longTpElem.getId(), orderId);
+// cancelNearestLongStopLoss();
return;
}
// [Gate-需求1] 空仓止盈触发：清空止盈状态 + 取消最近空仓止损
GridElement shortTpElem = GridElement.findByShortTakeProfitOrderId(orderId);
if (shortTpElem != null && StrUtil.isNotEmpty(tradeId) && !tradeId.equals("0")) {
shortTakeProfitTraderIdParam(shortTpElem, null, false);
- log.info("[Gate] 空仓止盈触发 gridId:{}, orderId:{}", shortTpElem.getId(), orderId);
- cancelNearestShortStopLoss();
+// log.info("[Gate] 空仓止盈触发 gridId:{}, orderId:{}", shortTpElem.getId(), orderId);
+// cancelNearestShortStopLoss();
// checkLastTakeProfitAndRestart();
return;
}
@@ -682,33 +701,33 @@
// );
// 空仓止盈：超额部分挂止盈，从entry网格向下逐个挂
- int shortBaseQty = Integer.parseInt(config.getBaseQuantity());
- int shortGridQty = Integer.parseInt(config.getQuantity());
- int shortTpCount = posSize > shortBaseQty ? (posSize - shortBaseQty) / shortGridQty : 0;
-
- int tpSpan = config.getTakeProfitGridSpan();
- for (int i = 0; i < shortTpCount; i++) {
- int tpGridId = shortGridElement.getId() - tpSpan * (i + 1);
- GridElement tpElem = GridElement.findById(tpGridId);
- // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
- if (tpElem == null || tpElem.getShortTraderParam().isTakeProfitPlaced()) {
- continue;
- }
- tpElem.getShortTraderParam().setTakeProfitPlaced(true);
- BigDecimal tpPrice = tpElem.getGridPrice();
- int finalTpGridId = tpGridId;
- executor.placeTakeProfit(
- tpPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_2,
- ORDER_TYPE_CLOSE_SHORT,
- config.getQuantity(),
- profitId -> {
- shortTakeProfitTraderIdParam(tpElem, profitId, true);
- log.info("[Gate] 空仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
- finalTpGridId, tpPrice, profitId);
- }
- );
- }
+// int shortBaseQty = Integer.parseInt(config.getBaseQuantity());
+// int shortGridQty = Integer.parseInt(config.getQuantity());
+// int shortTpCount = posSize > shortBaseQty ? (posSize - shortBaseQty) / shortGridQty : 0;
+//
+// int tpSpan = config.getTakeProfitGridSpan();
+// for (int i = 0; i < shortTpCount; i++) {
+// int tpGridId = shortGridElement.getId() - tpSpan * (i + 1);
+// GridElement tpElem = GridElement.findById(tpGridId);
+// // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
+// if (tpElem == null || tpElem.getShortTraderParam().isTakeProfitPlaced()) {
+// continue;
+// }
+// tpElem.getShortTraderParam().setTakeProfitPlaced(true);
+// BigDecimal tpPrice = tpElem.getGridPrice();
+// int finalTpGridId = tpGridId;
+// executor.placeTakeProfit(
+// tpPrice,
+// FuturesPriceTrigger.RuleEnum.NUMBER_2,
+// ORDER_TYPE_CLOSE_SHORT,
+// config.getQuantity(),
+// profitId -> {
+// shortTakeProfitTraderIdParam(tpElem, profitId, true);
+// log.info("[Gate] 空仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+// finalTpGridId, tpPrice, profitId);
+// }
+// );
+// }
}
}
GridElement longGridElement = GridElement.findByLongOrderId(orderId);
@@ -762,33 +781,33 @@
// );
// 多仓止盈：超额部分挂止盈，从entry网格向上逐个挂
- int longBaseQty = Integer.parseInt(config.getBaseQuantity());
- int longGridQty = Integer.parseInt(config.getQuantity());
- int longTpCount = posSize > longBaseQty ? (posSize - longBaseQty) / longGridQty : 0;
-
- int tpSpan = config.getTakeProfitGridSpan();
- for (int i = 0; i < longTpCount; i++) {
- int tpGridId = longGridElement.getId() + tpSpan * (i + 1);
- GridElement tpElem = GridElement.findById(tpGridId);
- // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
- if (tpElem == null || tpElem.getLongTraderParam().isTakeProfitPlaced()) {
- continue;
- }
- tpElem.getLongTraderParam().setTakeProfitPlaced(true);
- BigDecimal tpPrice = tpElem.getGridPrice();
- int finalTpGridId = tpGridId;
- executor.placeTakeProfit(
- tpPrice,
- FuturesPriceTrigger.RuleEnum.NUMBER_1,
- ORDER_TYPE_CLOSE_LONG,
- negate(config.getQuantity()),
- profitId -> {
- longTakeProfitTraderIdParam(tpElem, profitId, true);
- log.info("[Gate] 多仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
- finalTpGridId, tpPrice, profitId);
- }
- );
- }
+// int longBaseQty = Integer.parseInt(config.getBaseQuantity());
+// int longGridQty = Integer.parseInt(config.getQuantity());
+// int longTpCount = posSize > longBaseQty ? (posSize - longBaseQty) / longGridQty : 0;
+//
+// int tpSpan = config.getTakeProfitGridSpan();
+// for (int i = 0; i < longTpCount; i++) {
+// int tpGridId = longGridElement.getId() + tpSpan * (i + 1);
+// GridElement tpElem = GridElement.findById(tpGridId);
+// // 用 takeProfitPlaced 做同步标记，避免异步回调未执行时重复挂单
+// if (tpElem == null || tpElem.getLongTraderParam().isTakeProfitPlaced()) {
+// continue;
+// }
+// tpElem.getLongTraderParam().setTakeProfitPlaced(true);
+// BigDecimal tpPrice = tpElem.getGridPrice();
+// int finalTpGridId = tpGridId;
+// executor.placeTakeProfit(
+// tpPrice,
+// FuturesPriceTrigger.RuleEnum.NUMBER_1,
+// ORDER_TYPE_CLOSE_LONG,
+// negate(config.getQuantity()),
+// profitId -> {
+// longTakeProfitTraderIdParam(tpElem, profitId, true);
+// log.info("[Gate] 多仓止盈挂单, gridId:{}, 触发价:{}, takeProfitId:{}",
+// finalTpGridId, tpPrice, profitId);
+// }
+// );
+// }
}
}
}
@@ -1235,7 +1254,8 @@
if (newEntryGrid != null) {
- String quantity = String.valueOf((accumulatedLongLossCount + 1) * Integer.parseInt(config.getQuantity()));
+// String quantity = String.valueOf((accumulatedLongLossCount + 1) * Integer.parseInt(config.getQuantity()));
+ String quantity = String.valueOf(Math.max(queryPositionSize(Position.ModeEnum.DUAL_SHORT), shortPositionSize.intValue()) + 1);
// 向上遍历取消所有遗留多单（跳过基础入场网格0）
GridElement cancelCursor = GridElement.findById(newEntryGrid.getUpId());
while (cancelCursor != null) {
@@ -1290,7 +1310,8 @@
if (newEntryGrid != null) {
- String quantity = String.valueOf((accumulatedShortLossCount + 1) * Integer.parseInt(config.getQuantity()));
+// String quantity = String.valueOf((accumulatedShortLossCount + 1) * Integer.parseInt(config.getQuantity()));
+ String quantity = String.valueOf(Math.max(queryPositionSize(Position.ModeEnum.DUAL_LONG), longPositionSize.intValue()) + 1);
// 向下遍历取消所有遗留空单（跳过基础入场网格0）
GridElement cancelCursor = GridElement.findById(newEntryGrid.getDownId());
while (cancelCursor != null) {
@@ -1380,23 +1401,23 @@
}
}
- // 止损触发时，取消最远的多仓止盈订单
- GridElement farthestLongTp = null;
- for (GridElement e : config.getGridElements()) {
- if (e.getLongTakeProfitOrderId() != null) {
- if (farthestLongTp == null || e.getGridPrice().compareTo(farthestLongTp.getGridPrice()) > 0) {
- farthestLongTp = e;
- }
- }
- }
- if (farthestLongTp != null) {
- String tpOrderId = farthestLongTp.getLongTakeProfitOrderId();
- GridElement finalFarthestLongTp = farthestLongTp;
- executor.cancelConditionalOrder(tpOrderId, oid -> {
- longTakeProfitTraderIdParam(finalFarthestLongTp, null, false);
- log.info("[Gate] 多仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestLongTp.getId(), tpOrderId);
- });
- }
+// // 止损触发时，取消最远的多仓止盈订单
+// GridElement farthestLongTp = null;
+// for (GridElement e : config.getGridElements()) {
+// if (e.getLongTakeProfitOrderId() != null) {
+// if (farthestLongTp == null || e.getGridPrice().compareTo(farthestLongTp.getGridPrice()) > 0) {
+// farthestLongTp = e;
+// }
+// }
+// }
+// if (farthestLongTp != null) {
+// String tpOrderId = farthestLongTp.getLongTakeProfitOrderId();
+// GridElement finalFarthestLongTp = farthestLongTp;
+// executor.cancelConditionalOrder(tpOrderId, oid -> {
+// longTakeProfitTraderIdParam(finalFarthestLongTp, null, false);
+// log.info("[Gate] 多仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestLongTp.getId(), tpOrderId);
+// });
+// }
}
private void handleShortStopLossTriggered(GridElement gridElement, String orderId) {
@@ -1456,23 +1477,23 @@
}
}
- // 止损触发时，取消最远的空仓止盈订单
- GridElement farthestShortTp = null;
- for (GridElement e : config.getGridElements()) {
- if (e.getShortTakeProfitOrderId() != null) {
- if (farthestShortTp == null || e.getGridPrice().compareTo(farthestShortTp.getGridPrice()) < 0) {
- farthestShortTp = e;
- }
- }
- }
- if (farthestShortTp != null) {
- String tpOrderId = farthestShortTp.getShortTakeProfitOrderId();
- GridElement finalFarthestShortTp = farthestShortTp;
- executor.cancelConditionalOrder(tpOrderId, oid -> {
- shortTakeProfitTraderIdParam(finalFarthestShortTp, null, false);
- log.info("[Gate] 空仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestShortTp.getId(), tpOrderId);
- });
- }
+// // 止损触发时，取消最远的空仓止盈订单
+// GridElement farthestShortTp = null;
+// for (GridElement e : config.getGridElements()) {
+// if (e.getShortTakeProfitOrderId() != null) {
+// if (farthestShortTp == null || e.getGridPrice().compareTo(farthestShortTp.getGridPrice()) < 0) {
+// farthestShortTp = e;
+// }
+// }
+// }
+// if (farthestShortTp != null) {
+// String tpOrderId = farthestShortTp.getShortTakeProfitOrderId();
+// GridElement finalFarthestShortTp = farthestShortTp;
+// executor.cancelConditionalOrder(tpOrderId, oid -> {
+// shortTakeProfitTraderIdParam(finalFarthestShortTp, null, false);
+// log.info("[Gate] 空仓止损触发, 取消最远止盈 gridId:{}, orderId:{}", finalFarthestShortTp.getId(), tpOrderId);
+// });
+// }
}
// ========== 止盈/止损取消辅助方法 ==========
--
Gitblit v1.9.1