fix(okxNewPrice): 修复日志打印对象引用问题

Administrator

2025-12-17 8de96f93ff5f93768fd3ae3763a69a4e34fac016

 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java

@@ -26,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<>());
    }
    /**
     * 账户频道名称常量
     */
@@ -49,27 +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) {
        log.info("订阅成功: {}", response.getJSONObject("arg"));
    public static void initEvent(JSONObject response, String accountName) {
//        log.info("订阅成功: {}", response.getJSONObject("arg"));
        JSONObject arg = response.getJSONObject("arg");
        initParam(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()) {
@@ -88,10 +95,10 @@

                    for (int j = 0; j < detailsArray.size(); j++) {
                        JSONObject detail = detailsArray.getJSONObject(j);
//                        log.info("账户详情: {}", JSONUtil.formatJsonStr(String.valueOf(detail)));
                        //需要获取的参数
                        initParam(detail, accountName);

                        initParam(detail);
                        Map<String, String> accountMap = getAccountMap(accountName);
                        WsMapBuild.saveStringToMap(accountMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
                    }
                } catch (Exception innerEx) {
                    log.warn("处理账户频道数据失败", innerEx);
@@ -108,35 +115,36 @@
    public static final String cashBalKey = "cashBal";
    public static final String eqKey = "eq";
    public static final String uplKey = "upl";
    private static void initParam(JSONObject detail) {
    private static void initParam(JSONObject detail, String accountName) {
        Map<String, String> accountMap = getAccountMap(accountName);

        String ccy = WsMapBuild.parseStringSafe( detail.getString(ccyKey));
        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ccyKey, ccy);
        WsMapBuild.saveStringToMap(accountMap, ccyKey, ccy);

        String availBal = WsMapBuild.parseStringSafe(detail.getString(availBalKey));
        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, availBalKey, availBal);
        WsMapBuild.saveStringToMap(accountMap, availBalKey, availBal);

        String cashBal = WsMapBuild.parseStringSafe(detail.getString(cashBalKey));
        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
        WsMapBuild.saveStringToMap(accountMap, cashBalKey, cashBal);

        String eq = WsMapBuild.parseStringSafe(detail.getString(eqKey));
        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, eqKey, eq);
        WsMapBuild.saveStringToMap(accountMap, eqKey, eq);

        String upl = WsMapBuild.parseStringSafe(detail.getString(uplKey));
        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, uplKey, upl);
        WsMapBuild.saveStringToMap(accountMap, uplKey, upl);

        BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
        // 根据可用余额计算下单总保证金
        String total_order_usdtpecent = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.TOTAL_ORDER_USDTPECENT.name());
        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(ACCOUNTWSMAP, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));
        WsMapBuild.saveStringToMap(accountMap, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));

        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());
        WsMapBuild.saveStringToMap(accountMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_YES.getCode());

        log.info(
                "账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 全仓未实现盈亏: {}, 下单总保证金: {}",
                ccy, availBal, cashBal, eq, upl, totalOrderUsdt
                "{}: 账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 全仓未实现盈亏: {}, 下单总保证金: {}",
                accountName, ccy, availBal, cashBal, eq, upl, totalOrderUsdt
        );
    }
}