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/AccountWs.java | 110 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java
index a18b5cc..3d5fe77 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.okxNewPrice.okxWs;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
@@ -7,6 +8,7 @@
import com.xcong.excoin.modules.okxNewPrice.okxpi.MallUtils;
import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
+import io.micrometer.core.instrument.util.JsonUtils;
import lombok.extern.slf4j.Slf4j;
import org.java_websocket.client.WebSocketClient;
@@ -24,7 +26,13 @@
@Slf4j
public class AccountWs {
- public static final Map<String,String> ACCOUNTWSMAP = new ConcurrentHashMap<>();
+ // 使用双层Map，第一层key为账号名称，第二层key为数据key
+ private static final Map<String, Map<String, String>> ACCOUNTWSMAP = new ConcurrentHashMap<>();
+
+ // 获取指定账号的Map，如果不存在则创建
+ public static Map<String, String> getAccountMap(String accountName) {
+ return ACCOUNTWSMAP.computeIfAbsent(accountName, k -> new ConcurrentHashMap<>());
+ }
/**
* 账户频道名称常量
*/
@@ -47,21 +55,28 @@
String connId = MallUtils.getOrderNum(ACCOUNTWS_CHANNEL);
JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, option, argsArray);
webSocketClient.send(jsonObject.toJSONString());
- log.info("发送账户频道:{}", option);
+// log.info("发送账户频道:{}", option);
} catch (Exception e) {
log.error("订阅账户频道构建失败", e);
}
+ }
+
+ public static void initEvent(JSONObject response, String accountName) {
+// log.info("订阅成功: {}", response.getJSONObject("arg"));
+ JSONObject arg = response.getJSONObject("arg");
+ initParam(arg, accountName);
}
/**
* 处理账户频道推送的数据
*
* @param response 推送的 JSON 数据对象
+ * @param accountName 账号名称
*/
- public static void handleEvent(JSONObject response) {
+ public static void handleEvent(JSONObject response, String accountName) {
- log.info("开始执行AccountWs......{}",ACCOUNTWS_CHANNEL);
+// log.info("开始执行AccountWs......{}",ACCOUNTWS_CHANNEL);
try {
JSONArray dataArray = response.getJSONArray("data");
if (dataArray == null || dataArray.isEmpty()) {
@@ -80,44 +95,10 @@
for (int j = 0; j < detailsArray.size(); j++) {
JSONObject detail = detailsArray.getJSONObject(j);
- //需要获取的参数
- String ccyKey = "ccy";
- String availBalKey = "availBal";
- String cashBalKey = "cashBal";
- String eqKey = "eq";
- String imrKey = "imr";
+ initParam(detail, accountName);
- String ccy = WsMapBuild.parseStringSafe( detail.getString(ccyKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ccyKey, ccy);
-
- String availBal = WsMapBuild.parseStringSafe(detail.getString(availBalKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, availBalKey, availBal);
-
- String cashBal = WsMapBuild.parseStringSafe(detail.getString(cashBalKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
-
- String eq = WsMapBuild.parseStringSafe(detail.getString(eqKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, eqKey, eq);
-
- String imr = WsMapBuild.parseStringSafe(detail.getString(imrKey));
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, imrKey, imr);
-
- BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
- if (cashBalDecimal.compareTo(BigDecimal.ZERO) == 0) {
- log.warn("账户频道无效的账户余额数据，跳过处理");
- continue;
- }
-
- // 根据可用余额计算下单总保证金
- String total_order_usdtpecent = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.TOTAL_ORDER_USDTPECENT.name());
- BigDecimal total_order_usdt_factor = WsMapBuild.parseBigDecimalSafe(total_order_usdtpecent);
- BigDecimal totalOrderUsdt = cashBalDecimal.divide(total_order_usdt_factor, 4, RoundingMode.DOWN);
- WsMapBuild.saveStringToMap(ACCOUNTWSMAP, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));
-
- log.info(
- "账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 占用保证金: {}, 下单总保证金: {}",
- ccy, availBal, cashBal, eq, imr, totalOrderUsdt
- );
+ Map<String, String> accountMap = getAccountMap(accountName);
+ WsMapBuild.saveStringToMap(accountMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
}
} catch (Exception innerEx) {
log.warn("处理账户频道数据失败", innerEx);
@@ -128,5 +109,52 @@
}
}
+
+ public static final String ccyKey = "ccy";
+ public static final String availBalKey = "availBal";
+ public static final String cashBalKey = "cashBal";
+ public static final String eqKey = "eq";
+ public static final String uplKey = "upl";
+ public static final String imrKey = "imr";
+ private static void initParam(JSONObject detail, String accountName) {
+ Map<String, String> accountMap = getAccountMap(accountName);
+
+ String ccy = WsMapBuild.parseStringSafe( detail.getString(ccyKey));
+ WsMapBuild.saveStringToMap(accountMap, ccyKey, ccy);
+
+ String availBal = WsMapBuild.parseStringSafe(detail.getString(availBalKey));
+ WsMapBuild.saveStringToMap(accountMap, availBalKey, availBal);
+
+ String cashBal = WsMapBuild.parseStringSafe(detail.getString(cashBalKey));
+ WsMapBuild.saveStringToMap(accountMap, cashBalKey, cashBal);
+
+ String eq = WsMapBuild.parseStringSafe(detail.getString(eqKey));
+ WsMapBuild.saveStringToMap(accountMap, eqKey, eq);
+
+ String upl = WsMapBuild.parseStringSafe(detail.getString(uplKey));
+ WsMapBuild.saveStringToMap(accountMap, uplKey, upl);
+
+ String imr = WsMapBuild.parseStringSafe(detail.getString(imrKey));
+ WsMapBuild.saveStringToMap(accountMap, imrKey, imr);
+ BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
+ // 根据可用余额计算下单总保证金
+ String total_order_usdtpecent = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDTPECENT.name());
+ BigDecimal total_order_usdt_factor = WsMapBuild.parseBigDecimalSafe(total_order_usdtpecent);
+ BigDecimal totalOrderUsdt = cashBalDecimal.multiply(total_order_usdt_factor).setScale(2, RoundingMode.DOWN);
+ WsMapBuild.saveStringToMap(accountMap, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));
+
+ /**
+ * 当前账户未满仓，并且账户余额不为0，才更新为已就绪
+ */
+ BigDecimal imrDecimal = WsMapBuild.parseBigDecimalSafe(imr);
+ if (BigDecimal.ZERO.compareTo(cashBalDecimal) < 0 && imrDecimal.compareTo(totalOrderUsdt) < 0){
+ WsMapBuild.saveStringToMap(accountMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
+ }
+
+ log.info(
+ "{}: 账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 全仓未实现盈亏: {}, 下单总保证金: {},已使用保证金：{}",
+ accountName, ccy, availBal, cashBal, eq, upl, totalOrderUsdt,imr
+ );
+ }
}
--
Gitblit v1.9.1