From a80451b53728e62db65bafe7c4e7a43b5e3259cd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 14:11:20 +0800
Subject: [PATCH] feat(okxNewPrice): 新增止损冷静机制并优化订单状态控制
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 9 ++++++++-
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/enums/OrderParamEnums.java | 3 +++
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/InstrumentsWs.java | 1 +
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java | 2 +-
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java | 4 ++++
5 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
index d1cc961..a8cc452 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -37,6 +37,7 @@
// 构造Redis键名
final String coinCode = CoinEnums.HE_YUE.getCode();
final String instrumentsStateKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + coinCode + ":state";
+ final String instrumentsOutKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL+":" + coinCode+":out";
final String positionsMarkPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":markPx";
final String positionsAvgPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":avgPx";
final String positionsOrderPriceKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":orderPrice";
@@ -54,6 +55,11 @@
@Override
public String caoZuo() {
log.info("开始执行操作CaoZuoServiceImpl......");
+ String outStr = (String) redisUtils.get(instrumentsOutKey);
+ if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
+ log.error("止损过了......冷静一下，等待下次入场......");
+ return null;
+ }
// 获取合约执行操作状态
String state = (String) redisUtils.get(instrumentsStateKey);
@@ -62,7 +68,8 @@
return OrderParamEnums.ORDERING.getValue();
}
if (OrderParamEnums.STATE_3.getValue().equals(state)){
- log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
+ log.error("持仓盈亏超过下单总保证金，冷静止损......");
+ redisUtils.set(instrumentsOutKey, OrderParamEnums.OUT_YES.getValue(), 0);
return OrderParamEnums.OUT.getValue();
}
if (OrderParamEnums.STATE_2.getValue().equals(state)){
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/InstrumentsWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/InstrumentsWs.java
index b0b6db3..1f2eadf 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/InstrumentsWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/InstrumentsWs.java
@@ -24,6 +24,7 @@
&& redisUtils.set(INSTRUMENTSWS_CHANNEL+":" + CoinEnums.HE_YUE.getCode()+":minSz", "2", 0)
&& redisUtils.set(INSTRUMENTSWS_CHANNEL+":" + CoinEnums.HE_YUE.getCode()+":instIdCode", CoinEnums.HE_YUE.getCode(), 0)
&& redisUtils.set(INSTRUMENTSWS_CHANNEL+":" + CoinEnums.HE_YUE.getCode()+":state", OrderParamEnums.STATE_0.getValue(), 0)
+ && redisUtils.set(INSTRUMENTSWS_CHANNEL+":" + CoinEnums.HE_YUE.getCode()+":out", OrderParamEnums.OUT_NO.getValue(), 0)
;
if (!setResult) {
log.warn("Redis set operation failed for key: account:{}", CoinEnums.HE_YUE.getCode());
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
index 7feb78a..3ec8a4e 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
@@ -88,7 +88,7 @@
&& StrUtil.isNotBlank(stateStr)
&& state.equals(stateStr)
){
- redisUtils.set(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state", OrderParamEnums.STATE_1.getValue(), 0);
+ redisUtils.set(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state", OrderParamEnums.STATE_0.getValue(), 0);
}
}
} catch (Exception e) {
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
index f7ffced..093ac5e 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
@@ -24,6 +24,10 @@
public static void orderEvent(WebSocketClient webSocketClient, RedisUtils redisUtils, String side) {
log.info("开始执行TradeOrderWs......");
+ if (StrUtil.isBlank( side)){
+ log.warn("止损了，下次再战...");
+ return;
+ }
String buyCnt = null;
String ctval = getRedisValue(redisUtils, InstrumentsWs.INSTRUMENTSWS_CHANNEL, ":ctVal");
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/enums/OrderParamEnums.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/enums/OrderParamEnums.java
index b261051..183549c 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/enums/OrderParamEnums.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/enums/OrderParamEnums.java
@@ -9,6 +9,9 @@
@Getter
public enum OrderParamEnums {
+ OUT_NO("操作中", "操作中"),
+ OUT_YES("冷静中", "冷静中"),
+
ORDERING("操作下单中", "ORDERING"),
OUT("止损", "out"),
INIT("初始化", "init"),
--
Gitblit v1.9.1