From e1ec1ffbbee99c2b2b0d4d0b83a852fe9cd1092f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Dec 2025 11:15:35 +0800
Subject: [PATCH] refactor(okxNewPrice): 优化队列打印逻辑并调整日志描述
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 3a0514b..a27dad2 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
@@ -65,10 +65,7 @@
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;
}
@@ -104,13 +101,17 @@
+ "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
+ "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
+ "最新标记价格: {},累计手续费: {},累计持仓费: {},",
- 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,
markPx,fee,fundingFee
);
initParam(posData, accountName,posSide);
+
+ String accountNamePositons = initAccountName(accountName, posSide);
+ Map<String, BigDecimal> accountMap = getAccountMap(accountNamePositons);
+ WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
}
}
} catch (Exception e) {
@@ -131,7 +132,5 @@
WsMapBuild.saveBigDecimalToMap(accountMap, "realizedPnl", WsMapBuild.parseBigDecimalSafe(posData.getString("realizedPnl")));
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()));
}
}
--
Gitblit v1.9.1