From 7903e78b53a98e4ff0670a41476f2d1c16ac19fb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 06 Jan 2026 09:50:47 +0800
Subject: [PATCH] feat(okxNewPrice): 添加MACD和EMA组合交易策略实现
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 a3a072b..1983e8a 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
@@ -10,6 +10,7 @@
import com.xcong.excoin.modules.blackchain.service.DateUtil;
import com.xcong.excoin.modules.okxNewPrice.celue.CaoZuoService;
import com.xcong.excoin.modules.okxNewPrice.indicator.TradingStrategy;
+import com.xcong.excoin.modules.okxNewPrice.indicator.macdAndMatrategy.MacdEmaStrategy;
import com.xcong.excoin.modules.okxNewPrice.indicator.macdAndMatrategy.MacdMaStrategy;
import com.xcong.excoin.modules.okxNewPrice.okxWs.*;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
@@ -346,7 +347,8 @@
log.info("{}开仓{}:{}",time,closePx,instId);
//调用策略
// 创建策略实例
- MacdMaStrategy strategy = new MacdMaStrategy();
+// MacdMaStrategy strategy = new MacdMaStrategy();
+ MacdEmaStrategy strategy = new MacdEmaStrategy();
// 生成200个1m价格数据点
List<Kline> kline1MinuteData = getKlineDataByInstIdAndBar(instId, "1m");
@@ -354,16 +356,15 @@
.map(Kline::getC)
.collect(Collectors.toList());
- log.info("1m:{}", JSONUtil.parse( historicalPrices1M));
-
// 生成200个1D价格数据点
- List<Kline> kline1DayData = getKlineDataByInstIdAndBar(instId, "1D");
- List<BigDecimal> historicalPrices1D = kline1DayData.stream()
- .map(Kline::getC)
- .collect(Collectors.toList());
- log.info("1D:{}", JSONUtil.parse( historicalPrices1D));
+// List<Kline> kline1DayData = getKlineDataByInstIdAndBar(instId, "1D");
+// List<BigDecimal> historicalPrices1D = kline1DayData.stream()
+// .map(Kline::getC)
+// .collect(Collectors.toList());
+// log.info("1D:{}", JSONUtil.parse( historicalPrices1D));
// 使用策略分析最新价格数据
- MacdMaStrategy.TradingOrder tradingOrderOpenOpen = strategy.generateTradingOrder(historicalPrices1M,historicalPrices1D,MacdMaStrategy.OperationType.open.name());
+// MacdMaStrategy.TradingOrder tradingOrderOpenOpen = strategy.generateTradingOrder(historicalPrices1M,historicalPrices1D,MacdMaStrategy.OperationType.open.name());
+ MacdEmaStrategy.TradingOrder tradingOrderOpenOpen = strategy.generateTradingOrder(historicalPrices1M, MacdMaStrategy.OperationType.open.name());
if (tradingOrderOpenOpen == null){
return;
}
@@ -410,14 +411,12 @@
.map(Kline::getC)
.collect(Collectors.toList());
- log.info("1m:{}", JSONUtil.parse( historicalPrices1M));
// 生成200个1D价格数据点
List<Kline> kline1DayData = getKlineDataByInstIdAndBar(instId, "1D");
List<BigDecimal> historicalPrices1D = kline1DayData.stream()
.map(Kline::getC)
.collect(Collectors.toList());
- log.info("1D:{}", JSONUtil.parse( historicalPrices1D));
// 使用策略分析最新价格数据
MacdMaStrategy.TradingOrder tradingOrderOpenClose = strategy.generateTradingOrder(historicalPrices1M,historicalPrices1D,MacdMaStrategy.OperationType.close.name());
if (tradingOrderOpenClose == null){
--
Gitblit v1.9.1