From 55ff7a6e531b7957476732f299380bbab3ba0065 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 04 Jun 2026 15:42:32 +0800
Subject: [PATCH] feat(ws): 添加WebSocket订阅状态追踪功能
---
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 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 1f1dd41..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;
@@ -305,7 +306,23 @@
longPriceQueue.clear();
currentLongOrderIds.clear();
currentShortOrderIds.clear();
- log.info("[Gate] 网格策略已启动");
+
+ // 每次重启重新获取当前本金
+ refreshInitialPrincipal();
+
+ log.info("[Gate] 网格策略已启动, 当前本金: {} USDT", initialPrincipal);
+ }
+
+ /**
+ * 重新获取当前账户权益作为初始本金。
+ */
+ private void refreshInitialPrincipal() {
+ try {
+ FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
+ this.initialPrincipal = new BigDecimal(account.getTotal());
+ } catch (Exception e) {
+ log.warn("[Gate] 获取初始化本金失败，使用旧值: {}", initialPrincipal);
+ }
}
/**
@@ -353,11 +370,16 @@
BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
cumulativePnl, unrealizedPnl, totalPnl);
+
+ startGrid();
return;
}
//初始化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) -> {
@@ -559,19 +581,12 @@
BigDecimal totalPnl = cumulativePnl.add(unrealizedPnl);
log.info("[Gate] 已实现:{}, 未实现:{}, 合计:{}",
cumulativePnl, unrealizedPnl, totalPnl);
-
- if (totalPnl.compareTo(config.getOverallTp()) >= 0) {
- log.info("[Gate] 已达止盈目标(合计{})→已停止, 已实现:{}, 未实现:{}",
- totalPnl, cumulativePnl, unrealizedPnl);
- state = StrategyState.STOPPED;
- } else if (totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
+ if(totalPnl.compareTo(config.getMaxLoss().negate()) <= 0) {
String logMessage = StrUtil.format("[Gate] 已达亏损风险值(合计{}), 已实现:{}, 未实现:{}",
totalPnl, cumulativePnl, unrealizedPnl);
log.info(logMessage);
-
DingTalkUtils.getDefault().sendActionCard("风险提醒", logMessage, config.getApiKey(), "");
-// state = StrategyState.STOPPED;
}
}
@@ -913,7 +928,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_1,
ORDER_TYPE_CLOSE_SHORT,
- "1",
+ config.getQuantity(),
profitId -> {
elem.setShortStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -933,7 +948,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_2,
ORDER_TYPE_CLOSE_LONG,
- "-1",
+ negate(config.getQuantity()),
profitId -> {
elem.setLongStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1380,7 +1395,7 @@
BigDecimal priceDiff = longEntryPrice.subtract(triggerPrice).abs();
int entryQty = priceDiff.divide(config.getStep(), 0, RoundingMode.DOWN).intValue();
entryQty = Math.max(1, entryQty);
- String size = String.valueOf(entryQty);
+ String size = new BigDecimal(String.valueOf(entryQty)).multiply(new BigDecimal(config.getQuantity())).toString();
log.info("[Gate] 多仓止损触发 gridId:{}, 在gridId:{}挂{}张多单, 均价:{}, 价差:{}, 步长:{}",
gridId, newEntryGridId, entryQty, longEntryPrice, priceDiff, config.getStep());
newEntryGrid.getLongTraderParam().setQuantity(size);
@@ -1420,7 +1435,7 @@
BigDecimal priceDiff = shortEntryPrice.subtract(triggerPrice).abs();
int entryQty = priceDiff.divide(config.getStep(), 0, RoundingMode.DOWN).intValue();
entryQty = Math.max(1, entryQty);
- String size = String.valueOf(entryQty);
+ String size = new BigDecimal(String.valueOf(entryQty)).multiply(new BigDecimal(config.getQuantity())).toString();
log.info("[Gate] 空仓止损触发 gridId:{}, 在gridId:{}挂{}张空单, 均价:{}, 价差:{}, 步长:{}",
gridId, newEntryGridId, entryQty, shortEntryPrice, priceDiff, config.getStep());
newEntryGrid.getShortTraderParam().setQuantity(size);
@@ -1451,7 +1466,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_2,
ORDER_TYPE_CLOSE_LONG,
- "-1",
+ negate(config.getQuantity()),
profitId -> {
elem.setLongStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1484,7 +1499,7 @@
triggerPrice,
FuturesPriceTrigger.RuleEnum.NUMBER_1,
ORDER_TYPE_CLOSE_SHORT,
- "1",
+ config.getQuantity(),
profitId -> {
elem.setShortStopLossOrderId(profitId);
GridElement.refreshIndices();
@@ -1505,6 +1520,7 @@
unrealisedPnl, available, totalEquity, target);
if (totalEquity.compareTo(target) > 0) {
log.info("[Gate] 盈亏达标({}>{})，重置策略", totalEquity, target);
+ state = StrategyState.STOPPED;
closeExistingPositions();
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
startGrid();
@@ -1515,6 +1531,7 @@
}
private void handlePositionZeroAndReset(String direction) {
+ state = StrategyState.STOPPED;
try {
futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());
} catch (Exception e) {
@@ -1660,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