fix(okxNewPrice): 修复强制平仓逻辑判断条件

Administrator

2025-12-09 01d04ce9e26f29dcd03b7d6acb29dcd0c9f52334

 src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java

@@ -130,8 +130,13 @@
                @Override
                public void onOpen(ServerHandshake handshake) {
                    log.info("OKX account-order WebSocket连接成功");
                    resetHeartbeatTimer();
                    websocketLogin();
                    // 检查应用是否正在关闭
                    if (!sharedExecutor.isShutdown()) {
                        resetHeartbeatTimer();
                        websocketLogin();
                    } else {
                        log.warn("应用正在关闭，忽略WebSocket连接成功回调");
                    }
                }

                @Override
@@ -263,14 +268,15 @@
        } else if (PositionsWs.POSITIONSWS_CHANNEL.equals(channel)) {
            PositionsWs.handleEvent(response, redisUtils);

            String avgPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":avgPx";
            String avgPx = (String) redisUtils.get(avgPxKey);
            if (StrUtil.isBlank(avgPx)) {
                log.error("未获取到持仓均价");
            String posKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":pos";
            String pos = (String) redisUtils.get(posKey);
            if (StrUtil.isBlank(pos)) {
                log.error("未获取到持仓数量");
                TradeOrderWs.orderEvent(webSocketClient, redisUtils, OrderParamEnums.INIT.getValue());
                return;
            }

            String state = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
            String uplKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":upl";
            String totalOrderUsdtKey = AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":totalOrderUsdt";

@@ -278,14 +284,14 @@
            String totalOrderUsdt = (String) redisUtils.get(totalOrderUsdtKey);
            BigDecimal multiply = new BigDecimal(upl).multiply(new BigDecimal("-1"));

            if (new BigDecimal(totalOrderUsdt).compareTo(multiply) < 0) {
            if (new BigDecimal(totalOrderUsdt).compareTo(multiply) < 0 || OrderParamEnums.STATE_3.getValue().equals(state)) {
                log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
                TradeOrderWs.orderEvent(webSocketClient, redisUtils, OrderParamEnums.OUT.getValue());
                return;
            }

            String side = caoZuoService.caoZuo();
            if (StrUtil.isNotBlank(avgPx)) {
            if (StrUtil.isNotBlank(pos)) {
                TradeOrderWs.orderEvent(webSocketClient, redisUtils, side);
            }
        } else if (BalanceAndPositionWs.CHANNEL_NAME.equals(channel)) {
@@ -318,7 +324,8 @@
    private void resetHeartbeatTimer() {
        cancelPongTimeout();

        if (heartbeatExecutor != null) {
        // 检查线程池状态，避免在关闭过程中提交任务
        if (heartbeatExecutor != null && !heartbeatExecutor.isShutdown()) {
            pongTimeoutFuture = heartbeatExecutor.schedule(this::checkHeartbeatTimeout,
                    HEARTBEAT_TIMEOUT, TimeUnit.SECONDS);
        }