From 27ebdeb8a61d4af070d2ed52f77c814350b6dc54 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 05 Jan 2026 11:41:09 +0800
Subject: [PATCH] fix(okxNewPrice): 修复订单事件处理中的数据冲突问题
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 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..f890c9d 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
@@ -247,6 +247,11 @@
*/
private void handleWebSocketMessage(String message) {
try {
+ if ("pong".equals(message)) {
+ log.debug("{}: 收到心跳响应");
+ cancelPongTimeout();
+ return;
+ }
JSONObject response = JSON.parseObject(message);
String event = response.getString("event");
@@ -343,28 +348,27 @@
List<BigDecimal> historicalPrices1M = kline1MinuteData.stream()
.map(Kline::getC)
.collect(Collectors.toList());
- log.info("生成100个1分钟价格数据点成功！");
// 使用策略分析最新价格数据
MacdMaStrategy.TradingOrder tradingOrderOpen1M = strategy.generateTradingOrder(historicalPrices1M,MacdMaStrategy.OperationType.open.name());
if (tradingOrderOpen1M == 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;
- }
+// 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();
@@ -412,8 +416,6 @@
requestParam.put("bar", bar);
requestParam.put("limit", "200");
String result = ExchangeLoginService.getInstance(ExchangeInfoEnum.OKX_UAT.name()).lineHistory(requestParam);
- log.info("加载OKX-KLINE，{}", result);
-
JSONObject json = JSON.parseObject(result);
String data = json.getString("data");
@@ -515,9 +517,7 @@
private void sendPing() {
try {
if (webSocketClient != null && webSocketClient.isOpen()) {
- JSONObject ping = new JSONObject();
- ping.put("op", "ping");
- webSocketClient.send(ping.toJSONString());
+ webSocketClient.send("ping");
log.debug("发送ping请求");
}
} catch (Exception e) {
--
Gitblit v1.9.1