From 24bd0399d73a2d48e50233326fca7d9526f06259 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 29 Dec 2025 14:15:59 +0800
Subject: [PATCH] refactor(trading): 重构MACD策略交易信号生成逻辑
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 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 341c619..439290d 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.okxNewPrice;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONException;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -344,8 +345,9 @@
.collect(Collectors.toList());
log.info("生成100个15分钟价格数据点成功！");
// 使用策略分析最新价格数据
- MacdMaStrategy.TradingOrder tradingOrder = strategy.generateTradingOrder(historicalPrices);
- if (tradingOrder == null){
+ MacdMaStrategy.TradingOrder tradingOrderOpen = strategy.generateTradingOrder(historicalPrices,MacdMaStrategy.OperationType.open.name());
+ MacdMaStrategy.TradingOrder tradingOrderClose = strategy.generateTradingOrder(historicalPrices,MacdMaStrategy.OperationType.close.name());
+ if (tradingOrderOpen == null && tradingOrderClose == null){
return;
}
Collection<OkxQuantWebSocketClient> allClients = clientManager.getAllClients();
@@ -357,38 +359,37 @@
for (OkxQuantWebSocketClient client : clientManager.getAllClients()) {
String accountName = client.getAccountName();
if (accountName != null) {
- // 根据信号执行交易操作
- TradeRequestParam tradeRequestParam = new TradeRequestParam();
+ if (ObjectUtil.isNotEmpty(tradingOrderOpen)){
+ // 根据信号执行交易操作
+ TradeRequestParam tradeRequestParam = new TradeRequestParam();
- String posSide = tradingOrder.getPosSide();
- tradeRequestParam.setPosSide(posSide);
- String currentPrice = String.valueOf(closePx);
- tradeRequestParam = caoZuoService.caoZuoStrategy(accountName, currentPrice, posSide);
+ String posSide = tradingOrderOpen.getPosSide();
+ tradeRequestParam.setPosSide(posSide);
+ String currentPrice = String.valueOf(closePx);
+ tradeRequestParam = caoZuoService.caoZuoStrategy(accountName, currentPrice, posSide);
- String side = tradingOrder.getSide();
- tradeRequestParam.setSide(side);
+ String side = tradingOrderOpen.getSide();
+ tradeRequestParam.setSide(side);
- String clOrdId = WsParamBuild.getOrderNum(side);
- tradeRequestParam.setClOrdId(clOrdId);
+ String clOrdId = WsParamBuild.getOrderNum(side);
+ tradeRequestParam.setClOrdId(clOrdId);
- String sz = null;
- if (
- (posSide == CoinEnums.POSSIDE_LONG.getCode() && side == CoinEnums.SIDE_BUY.getCode())
- ||
- (posSide == CoinEnums.POSSIDE_SHORT.getCode() && side == CoinEnums.SIDE_SELL.getCode())
- ){
- sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
- }else if (
- (posSide == CoinEnums.POSSIDE_LONG.getCode() && side == CoinEnums.SIDE_SELL.getCode())
- ||
- (posSide == CoinEnums.POSSIDE_SHORT.getCode() && side == CoinEnums.SIDE_BUY.getCode())
- ){
- BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, posSide)).get("pos");
-
- sz = String.valueOf(pos);
+ String sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
+ tradeRequestParam.setSz(sz);
+ TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
}
- tradeRequestParam.setSz(sz);
- TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
+ if (ObjectUtil.isNotEmpty(tradingOrderClose)){
+ // 根据信号执行交易操作
+ TradeRequestParam tradeRequestParam = new TradeRequestParam();
+
+ String posSide = tradingOrderClose.getPosSide();
+ tradeRequestParam.setPosSide(posSide);
+ String currentPrice = String.valueOf(closePx);
+ tradeRequestParam = caoZuoService.caoZuoZhiSunEvent(accountName, currentPrice, posSide);
+
+ TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
+ }
+
}
}
}
--
Gitblit v1.9.1