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 | 76 ++++++++++++++++----------------------
1 files changed, 32 insertions(+), 44 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 ca961ee..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,25 +338,16 @@
MacdMaStrategy strategy = new MacdMaStrategy();
// 生成100个15分钟价格数据点
- List<Kline> kline15MinuteData = getKlineDataByInstIdAndBar(instId, "1D");
- List<BigDecimal> fiveMinPrices = kline15MinuteData.stream()
+ List<Kline> kline15MinuteData = getKlineDataByInstIdAndBar(instId, "1m");
+ List<BigDecimal> historicalPrices = kline15MinuteData.stream()
.map(Kline::getC)
.collect(Collectors.toList());
- try {
- // 执行策略
- strategy.execute(fiveMinPrices);
- boolean skip = strategy.getSkip();
- if (skip){
- log.info("跳过");
- return;
- }
-
- System.out.println("策略初始化成功！");
- } catch (Exception e) {
- System.err.println("策略初始化失败：" + e.getMessage());
- e.printStackTrace();
+ log.info("生成100个15分钟价格数据点成功！");
+ // 使用策略分析最新价格数据
+ MacdMaStrategy.TradingOrder tradingOrder = strategy.generateTradingOrder(historicalPrices);
+ if (tradingOrder == null){
+ return;
}
-
Collection<OkxQuantWebSocketClient> allClients = clientManager.getAllClients();
//如果为空，则直接返回
if (allClients.isEmpty()) {
@@ -365,39 +357,35 @@
for (OkxQuantWebSocketClient client : clientManager.getAllClients()) {
String accountName = client.getAccountName();
if (accountName != null) {
+ // 根据信号执行交易操作
TradeRequestParam tradeRequestParam = new TradeRequestParam();
- tradeRequestParam = strategy.getOrderParamOpen(tradeRequestParam);
- String posSide = tradeRequestParam.getPosSide();
- String side = tradeRequestParam.getSide();
- BigDecimal posHold = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, posSide)).get("pos");
- if (posHold.compareTo(BigDecimal.ZERO) > 0){
- tradeRequestParam = strategy.getOrderParamClose(tradeRequestParam);
- }
+
+ String posSide = tradingOrder.getPosSide();
+ 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