From d22108cd8800df3f8d4ab9f7b125ece79639faf3 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 11 May 2026 10:21:51 +0800
Subject: [PATCH] fix(trade): 优化网格交易日志输出并实现市价止盈机制
---
src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/CandlestickChannelHandler.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/CandlestickChannelHandler.java b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/CandlestickChannelHandler.java
index ca5eaf0..9384359 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/CandlestickChannelHandler.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/wsHandler/handler/CandlestickChannelHandler.java
@@ -20,8 +20,8 @@
* <pre>
* WebSocket 推送 update event
* → handleMessage() → 解析 OHLCV → log 打印 → gridTradeService.onKline(closePx)
- * → 首次 K 线触发双开
- * → 后续 K 线仅缓存 lastKlinePrice 供补仓参考
+ * → WAITING_KLINE: 首次 K 线触发基底双开
+ * → ACTIVE: 驱动 processShortGrid + processLongGrid 网格触发
* </pre>
*
* <h3>订阅格式</h3>
@@ -76,7 +76,9 @@
@Override
public boolean handleMessage(JSONObject response) {
- if (!CHANNEL_NAME.equals(response.getString("channel"))) return false;
+ if (!CHANNEL_NAME.equals(response.getString("channel"))) {
+ return false;
+ }
try {
JSONArray resultArray = response.getJSONArray("result");
if (resultArray == null || resultArray.isEmpty()) { log.warn("[{}] 数据为空", CHANNEL_NAME); return true; }
@@ -85,13 +87,12 @@
log.info("========== Gate K线数据 ==========");
log.info("名称: {} 时间: {}", data.getString("n"), DateUtil.TimeStampToDateTime(data.getLong("t")));
- log.info("开盘: {} 最高: {} 最低: {} 收盘: {} 成交量: {} 成交额: {} 已完结: {}",
- data.getString("o"), data.getString("h"), data.getString("l"),
- data.getString("c"), data.getString("v"), data.getString("a"),
- data.getBooleanValue("w"));
+ log.info("收盘: {} 已完结: {}",data.getString("c"),data.getBooleanValue("w"));
log.info("==================================");
- if (gridTradeService != null) gridTradeService.onKline(closePx);
+ if (gridTradeService != null) {
+ gridTradeService.onKline(closePx);
+ }
} catch (Exception e) { log.error("[{}] 处理数据失败", CHANNEL_NAME, e); }
return true;
}
--
Gitblit v1.9.1