From 875336c34c44092126fa6ae6a7a6ef98953eac22 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Jun 2026 11:18:15 +0800
Subject: [PATCH] fix(gateApi): 修复网格交易止盈订单ID计算逻辑
---
src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionsChannelHandler.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionsChannelHandler.java b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionsChannelHandler.java
index 6584fb9..9608782 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionsChannelHandler.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/PositionsChannelHandler.java
@@ -4,13 +4,13 @@
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.gateApi.GateGridTradeService;
import com.xcong.excoin.modules.gateApi.wsHandler.AbstractPrivateChannelHandler;
+import io.gate.gateapi.models.Position;
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
/**
- * 仓位频道处理器。
- * 私有频道，需认证。解析仓位推送后回调 {@link GateGridTradeService#onPositionUpdate}。
+ * 仓位频道处理器（futures.positions），接收仓位更新推送并回调 {@link GateGridTradeService#onPositionUpdate}。
*
* @author Administrator
*/
@@ -19,6 +19,12 @@
private static final String CHANNEL_NAME = "futures.positions";
+ /**
+ * @param apiKey Gate API v4 密钥，用于签名认证
+ * @param apiSecret Gate API v4 签名密钥
+ * @param contract 合约名称（如 ETH_USDT）
+ * @param gridTradeService 网格交易策略服务实例
+ */
public PositionsChannelHandler(String apiKey, String apiSecret,
String contract,
GateGridTradeService gridTradeService) {
@@ -27,8 +33,7 @@
@Override
public boolean handleMessage(JSONObject response) {
- String channel = response.getString("channel");
- if (!CHANNEL_NAME.equals(channel)) {
+ if (!CHANNEL_NAME.equals(response.getString("channel"))) {
return false;
}
try {
@@ -41,18 +46,22 @@
if (!getContract().equals(pos.getString("contract"))) {
continue;
}
- String mode = pos.getString("mode");
+ String modeStr = pos.getString("mode");
+ Position.ModeEnum mode = Position.ModeEnum.fromValue(modeStr);
BigDecimal size = new BigDecimal(pos.getString("size"));
BigDecimal entryPrice = new BigDecimal(pos.getString("entry_price"));
- log.info("[{}] 推送: contract={}, mode={}, size={}, entry_price={}",
- CHANNEL_NAME, getContract(), mode, size, entryPrice);
+ log.info("[{}] 持仓更新, 合约:{}, 模式:{}, 数量:{}, 入场价:{}, 全仓杠杆上限:{}, 历史盈亏:{}, 历史点卡:{}, 最近平仓盈亏:{}, 杠杆:{}, 最大杠杆:{}, 爆仓价:{}, 维持保证金率:{}, 保证金:{}, 已实现盈亏:{}, 点卡已实现盈亏:{}, 风险限额:{}, 时间:{}, 时间ms:{}, 用户:{}, 更新ID:{}",
+ CHANNEL_NAME, pos.getString("contract"), modeStr, size, entryPrice,
+ pos.get("cross_leverage_limit"), pos.get("history_pnl"), pos.get("history_point"),
+ pos.get("last_close_pnl"), pos.get("leverage"), pos.get("leverage_max"),
+ pos.get("liq_price"), pos.get("maintenance_rate"), pos.get("margin"),
+ pos.get("realised_pnl"), pos.get("realised_point"), pos.get("risk_limit"),
+ pos.get("time"), pos.get("time_ms"), pos.get("user"), pos.get("update_id"));
if (getGridTradeService() != null) {
getGridTradeService().onPositionUpdate(getContract(), mode, size, entryPrice);
}
}
- } catch (Exception e) {
- log.error("[{}] 处理数据失败", CHANNEL_NAME, e);
- }
+ } catch (Exception e) { log.error("[{}] 处理数据失败", CHANNEL_NAME, e); }
return true;
}
}
--
Gitblit v1.9.1