From 212e20fa6e9d0cc69d7f70339ecd47d4ec286533 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 04 Jan 2026 11:03:41 +0800
Subject: [PATCH] feat(okxNewPrice): 优化MACD策略交易判断逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
index 953f4b6..fb1812b 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
@@ -350,21 +350,21 @@
return;
}
- List<Kline> kline15MinuteData = getKlineDataByInstIdAndBar(instId, "15m");
- List<BigDecimal> historicalPrices15M = kline15MinuteData.stream()
- .map(Kline::getC)
- .collect(Collectors.toList());
- // 使用策略分析最新价格数据
- MacdMaStrategy.TradingOrder tradingOrderOpen15M = strategy.generateTradingOrder(historicalPrices15M,MacdMaStrategy.OperationType.open.name());
- if (tradingOrderOpen15M == null ){
- return;
- }
+// List<Kline> kline15MinuteData = getKlineDataByInstIdAndBar(instId, "15m");
+// List<BigDecimal> historicalPrices15M = kline15MinuteData.stream()
+// .map(Kline::getC)
+// .collect(Collectors.toList());
+// // 使用策略分析最新价格数据
+// MacdMaStrategy.TradingOrder tradingOrderOpen15M = strategy.generateTradingOrder(historicalPrices15M,MacdMaStrategy.OperationType.open.name());
+// if (tradingOrderOpen15M == null ){
+// return;
+// }
+//
+// if (!tradingOrderOpen1M.getPosSide().equals(tradingOrderOpen15M.getPosSide())){
+// return;
+// }
- if (!tradingOrderOpen1M.getPosSide().equals(tradingOrderOpen15M.getPosSide())){
- return;
- }
-
- log.info("1分钟和15分钟K线方向一致，开始执行交易操作！");
+// log.info("1分钟和15分钟K线方向一致，开始执行交易操作！");
Collection<OkxQuantWebSocketClient> allClients = clientManager.getAllClients();
--
Gitblit v1.9.1