From dfd766139d37b0bd038288952cb24df76f4289f9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Dec 2025 17:38:56 +0800
Subject: [PATCH] feat(redis): 添加带延迟的Redis读取方法以提高数据一致性
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 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 a8cc452..68f6774 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
@@ -1,10 +1,7 @@
package com.xcong.excoin.modules.okxNewPrice.celue;
import cn.hutool.core.util.StrUtil;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.AccountWs;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.InstrumentsWs;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.PositionsWs;
-import com.xcong.excoin.modules.okxNewPrice.okxWs.TradeOrderWs;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.*;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
import com.xcong.excoin.modules.okxNewPrice.wangge.WangGeQueue;
@@ -54,15 +51,19 @@
*/
@Override
public String caoZuo() {
- log.info("开始执行操作CaoZuoServiceImpl......");
+ String state = (String) redisUtils.get(instrumentsStateKey);
+ log.info("开始执行操作CaoZuoServiceImpl......{}",state);
+
+ String live = (String) redisUtils.getWithDelay(TradeOrderWs.ORDERWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
+ if (!CoinEnums.ORDER_LIVE.getCode().equals( live)){
+ log.warn("正在下单中，等待下单结束...");
+ }
+ // 获取合约执行操作状态
String outStr = (String) redisUtils.get(instrumentsOutKey);
- if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
+ if (OrderParamEnums.OUT_YES.getValue().equals(outStr) && OrderParamEnums.STATE_3.getValue().equals(state)){
log.error("止损过了......冷静一下，等待下次入场......");
return null;
}
-
- // 获取合约执行操作状态
- String state = (String) redisUtils.get(instrumentsStateKey);
if (OrderParamEnums.STATE_4.getValue().equals(state)) {
log.error("操作下单中，等待......");
return OrderParamEnums.ORDERING.getValue();
@@ -82,23 +83,23 @@
}
String pos = (String) redisUtils.get(positionsPosKey);
- if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) <= 0) {
+ if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) >= 0) {
log.error("未获取到持仓数量");
return OrderParamEnums.INIT.getValue();
}
String uplStr = (String) redisUtils.get(positionsUplKey);
- if (StrUtil.isBlank(uplStr)){
+ //可使用的总保证金
+ String cashBalStrKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":cashBal";
+ String cashBalStr = (String) redisUtils.get(cashBalStrKey);
+ if (StrUtil.isBlank(cashBalStr) || StrUtil.isBlank(uplStr)){
return OrderParamEnums.INIT.getValue();
}
- //可使用的总保证金
- String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";
- String totalOrderUsdt = (String) redisUtils.get(totalOrderUsdtKey);
BigDecimal upl = new BigDecimal(uplStr);
if (BigDecimal.ZERO.compareTo(upl) >= 0){
upl = upl.multiply(new BigDecimal("-1"));
-
- if (upl.compareTo(new BigDecimal(totalOrderUsdt)) >= 0) {
+ BigDecimal bigDecimal = new BigDecimal(cashBalStr).multiply(new BigDecimal(OrderParamEnums.ZHI_SUN.getValue()));
+ if (upl.compareTo(bigDecimal) >= 0) {
log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
return OrderParamEnums.OUT.getValue();
}
@@ -145,6 +146,13 @@
side = OrderParamEnums.BUY.getValue();
redisUtils.set(positionsOrderPriceKey, String.valueOf(kaiCang.getValue()), 0);
} else {
+ //判断是否加仓（当前持仓过小，可以加仓）
+ boolean isAddCang = doAddCang();
+ log.info("加仓过程中发现持仓过小 ：{}",isAddCang);
+ if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ return OrderParamEnums.BUY.getValue();
+ }
log.info("未触发加仓......，等待");
}
} else if (avgPx.compareTo(markPx) < 0) {
@@ -172,6 +180,13 @@
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.SELL.getValue();
}else{
+ //判断是否加仓（当前持仓过小，可以加仓）
+ boolean isAddCang = doAddCang();
+ log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
+ if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ return OrderParamEnums.BUY.getValue();
+ }
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.HOLDING.getValue();
@@ -183,6 +198,13 @@
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.SELL.getValue();
}else{
+ //判断是否加仓（当前持仓过小，可以加仓）
+ boolean isAddCang = doAddCang();
+ log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
+ if (isAddCang){
+ log.info("触发加仓......，持仓过小");
+ return OrderParamEnums.BUY.getValue();
+ }
log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
return OrderParamEnums.HOLDING.getValue();
@@ -203,6 +225,14 @@
log.error("解析价格失败，请检查Redis中的值是否合法", e);
return OrderParamEnums.HOLDING.getValue();
}
+ }
+
+ private boolean doAddCang() {
+ String imr = (String) redisUtils.get(positionsImrKey);
+ BigDecimal imrValue = new BigDecimal(StrUtil.isBlank(imr) ? "0" : imr);
+ String everyTimeUsdt = (String) redisUtils.get(AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":everyTimeUsdt");
+ BigDecimal everyTimeUsdtValue = new BigDecimal(everyTimeUsdt);
+ return everyTimeUsdtValue.compareTo(imrValue) >= 0;
}
/**
@@ -228,8 +258,8 @@
log.warn("无效的价格格式: {}", orderPrice);
return;
}
- // 删除比该价格大的数据（由于是降序队列，所以是删除value.compareTo(priceDecimal) < 0的元素）
- queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
+ // 删除比该价格大的数据
+ queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
// 打印开仓队列
StringBuilder kaiCangStr = new StringBuilder();
kaiCangStr.append("开仓队列: [");
@@ -244,8 +274,8 @@
kaiCangStr.append("]");
log.info(kaiCangStr.toString());
- // 删除比该价格小的数据（由于是升序队列，所以是删除value.compareTo(priceDecimal) > 0的元素）
- queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
+ // 删除比该价格小的数据
+ queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
// 打印平仓队列
StringBuilder pingCangStr = new StringBuilder();
--
Gitblit v1.9.1