From 7e2bea36ff56e4fb2ce462ea556ea62469b99de6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 19 Dec 2025 13:55:46 +0800
Subject: [PATCH] fix(okxNewPrice): 调整网格列表枚举参数
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
index b03b897..f1a8d12 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
import com.xcong.excoin.modules.okxNewPrice.okxpi.MallUtils;
import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
@@ -10,6 +11,7 @@
import org.java_websocket.client.WebSocketClient;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -41,7 +43,7 @@
String connId = MallUtils.getOrderNum(POSITIONSWS_CHANNEL);
JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, option, argsArray);
webSocketClient.send(jsonObject.toJSONString());
-// log.info("发送持仓频道频道:{}", option);
+ log.info("发送持仓频道频道:{}", option);
} catch (Exception e) {
log.error("订阅持仓频道频道构建失败", e);
}
@@ -52,7 +54,7 @@
}
public static void initEvent(JSONObject response, String accountName) {
-// log.info("订阅成功,数据初始化: {}", response.getJSONObject("arg"));
+ log.info("订阅成功,数据初始化: {}", response.getJSONObject("arg"));
JSONObject arg = response.getJSONObject("arg");
initParam(arg, accountName,CoinEnums.POSSIDE_LONG.getCode());
initParam(arg, accountName,CoinEnums.POSSIDE_SHORT.getCode());
@@ -61,14 +63,11 @@
public static void handleEvent(JSONObject response, String accountName) {
-// log.info("开始执行PositionsWs......");
+ log.info("开始执行PositionsWs......");
try {
JSONArray dataArray = response.getJSONArray("data");
if (dataArray == null || dataArray.isEmpty()) {
-// log.info("账户持仓频道数据为空,已当前价买入，并且初始化网格");
- JSONObject posData = new JSONObject();
- initParam(posData, accountName,CoinEnums.POSSIDE_LONG.getCode());
- initParam(posData, accountName,CoinEnums.POSSIDE_SHORT.getCode());
+ log.info("账户持仓频道数据为空,等待更新");
return;
}
@@ -76,7 +75,7 @@
JSONObject posData = dataArray.getJSONObject(i);
String instId = posData.getString("instId");
if (CoinEnums.HE_YUE.getCode().equals(instId)) {
-// log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
+ log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
String mgnMode = posData.getString("mgnMode");
String posSide = posData.getString("posSide");
String pos = posData.getString("pos");
@@ -104,7 +103,7 @@
+ "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
+ "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
+ "最新标记价格: {},累计手续费: {},累计持仓费: {},",
- accountName, instId, mgnMode, posSide, pos, avgPx,
+ initAccountName(accountName, posSide), instId, mgnMode, posSide, pos, avgPx,
upl, uplRatio, lever, liqPx, imr,
mgnRatio, mmr, notionalUsd, ccy,
last, idxPx, bePx, realizedPnl, settledPnl,
@@ -132,6 +131,11 @@
WsMapBuild.saveBigDecimalToMap(accountMap, "fee", WsMapBuild.parseBigDecimalSafe(posData.getString("fee")));
WsMapBuild.saveBigDecimalToMap(accountMap, "fundingFee", WsMapBuild.parseBigDecimalSafe(posData.getString("fundingFee")));
- WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
+ BigDecimal ordFrozImr = PositionsWs.getAccountMap(accountNamePositons).get("imr");
+ BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDT.name()))
+ .divide(new BigDecimal("2"), RoundingMode.DOWN);
+ if (ordFrozImr.compareTo(totalOrderUsdt) <= 0){
+ WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
+ }
}
}
--
Gitblit v1.9.1