From 6b5efcaafe57c8c7f0e9c7761d960be063dfd8a2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 29 Dec 2025 13:40:12 +0800
Subject: [PATCH] fix(okxNewPrice): 修复K线数据获取的时间间隔错误
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 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 e8f5708..341c619 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
@@ -56,7 +56,8 @@
private final AtomicBoolean isConnecting = new AtomicBoolean(false);
private final AtomicBoolean isInitialized = new AtomicBoolean(false);
- private static final String CHANNEL = "candle5m";
+ private static final String CHANNEL = "candle1m";
+// private static final String CHANNEL = "candle5m";
// private static final String CHANNEL = "candle15m";
// 心跳超时时间(秒)，小于30秒
@@ -337,14 +338,16 @@
MacdMaStrategy strategy = new MacdMaStrategy();
// 生成100个15分钟价格数据点
- List<Kline> kline15MinuteData = getKlineDataByInstIdAndBar(instId, "15m");
+ List<Kline> kline15MinuteData = getKlineDataByInstIdAndBar(instId, "1m");
List<BigDecimal> historicalPrices = kline15MinuteData.stream()
.map(Kline::getC)
.collect(Collectors.toList());
log.info("生成100个15分钟价格数据点成功！");
// 使用策略分析最新价格数据
MacdMaStrategy.TradingOrder tradingOrder = strategy.generateTradingOrder(historicalPrices);
-
+ if (tradingOrder == null){
+ return;
+ }
Collection<OkxQuantWebSocketClient> allClients = clientManager.getAllClients();
//如果为空，则直接返回
if (allClients.isEmpty()) {
@@ -356,33 +359,33 @@
if (accountName != null) {
// 根据信号执行交易操作
TradeRequestParam tradeRequestParam = new TradeRequestParam();
+
String posSide = tradingOrder.getPosSide();
- String side = tradingOrder.getSide();
+ tradeRequestParam.setPosSide(posSide);
String currentPrice = String.valueOf(closePx);
tradeRequestParam = caoZuoService.caoZuoStrategy(accountName, currentPrice, posSide);
+
+ String side = tradingOrder.getSide();
+ tradeRequestParam.setSide(side);
+
String clOrdId = WsParamBuild.getOrderNum(side);
tradeRequestParam.setClOrdId(clOrdId);
+
String sz = null;
- if (posSide == CoinEnums.POSSIDE_LONG.getCode()){
- if (side == CoinEnums.SIDE_BUY.getCode()){
- sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
- }else if (side == CoinEnums.SIDE_SELL.getCode()){
- BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_LONG.getCode())).get("pos");
- if (BigDecimal.ZERO.compareTo( pos) >= 0) {
- tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
- }
- sz = String.valueOf( pos);
- }
- }else if (posSide == CoinEnums.POSSIDE_SHORT.getCode()){
- if (side == CoinEnums.SIDE_BUY.getCode()){
- BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_SHORT.getCode())).get("pos");
- if (BigDecimal.ZERO.compareTo( pos) >= 0) {
- tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
- }
- sz = String.valueOf( pos);
- }else if (side == CoinEnums.SIDE_SELL.getCode()){
- sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
- }
+ 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);
}
tradeRequestParam.setSz(sz);
TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
--
Gitblit v1.9.1