feat(okxNewPrice): 启用关键业务日志记录功能

Administrator

2025-12-13 5be6cacbb75914e146c78df15a55ef9f520b3e8f

feat(okxNewPrice): 启用关键业务日志记录功能

- 启用 CaoZuoServiceImpl 中的账户与仓位状态检查日志
- 启用未实现盈亏、预期亏损与抗仓金额计算日志
- 启用开仓价格与当前价格匹配逻辑的日志输出
- 启用加仓与减仓触发条件判断相关日志
- 启用订单移除及队列更新操作的日志打印
- 启用 TradeOrderWs 中交易状态处理流程日志
- 启用 OrderInfoWs 中订单详情解析与完成状态日志

 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java

@@ -40,16 +40,16 @@
     */
    @Override
    public String caoZuo() {
//        log.info("开始执行操作CaoZuoServiceImpl......");
        log.info("开始执行操作CaoZuoServiceImpl......");
        String accountReadyState = AccountWs.ACCOUNTWSMAP.get(CoinEnums.READY_STATE.name());
        if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
//            log.info("账户通道未就绪，取消发送");
            log.info("账户通道未就绪，取消发送");
            return null;
        }
        BigDecimal positionsReadyState = PositionsWs.POSITIONSWSMAP.get(CoinEnums.READY_STATE.name()) == null
                ? BigDecimal.ZERO : PositionsWs.POSITIONSWSMAP.get(CoinEnums.READY_STATE.name());
        if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
//            log.info("仓位通道未就绪，取消发送");
            log.info("仓位通道未就绪，取消发送");
            return null;
        }
        // 系统设置的开关，等于冷静中，则代表不开仓
@@ -70,13 +70,13 @@
         */
        // 实际亏损金额
        BigDecimal realKuiSunAmount = WsMapBuild.parseBigDecimalSafe(AccountWs.ACCOUNTWSMAP.get("upl"));
//        log.info("未实现盈亏: {}", realKuiSunAmount);
        log.info("未实现盈亏: {}", realKuiSunAmount);
        String zhiSunPercent = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.ZHI_SUN.name());
        BigDecimal zhiSunAmount = cashBal.multiply(new BigDecimal(zhiSunPercent));
//        log.info("预期亏损金额: {}", zhiSunAmount);
        log.info("预期亏损金额: {}", zhiSunAmount);
        String kangYaPercent = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.KANG_CANG.name());
        BigDecimal  kangYaAmount = cashBal.multiply(new BigDecimal(kangYaPercent));
//        log.info("预期抗仓金额: {}", kangYaAmount);
        log.info("预期抗仓金额: {}", kangYaAmount);

        if (realKuiSunAmount.compareTo(BigDecimal.ZERO) < 0){
            realKuiSunAmount = realKuiSunAmount.multiply(new BigDecimal("-1"));
@@ -118,7 +118,7 @@
            // 获取标记价格和平均持仓价格
            BigDecimal markPx = PositionsWs.POSITIONSWSMAP.get("markPx");
            BigDecimal avgPx = PositionsWs.POSITIONSWSMAP.get("avgPx");
//            log.info("开仓价格: {}, 当前价格：{}，匹配队列中......", avgPx, markPx);
            log.info("开仓价格: {}, 当前价格：{}，匹配队列中......", avgPx, markPx);

            // 初始化网格队列
            PriorityBlockingQueue<AscBigDecimal> queueAsc = WangGeQueue.getQueueAsc();
@@ -131,7 +131,7 @@
            WsMapBuild.saveStringToMap(OrderInfoWs.ORDERINFOWSMAP, "orderPrice", String.valueOf(markPx));
            // 判断是加仓还是减仓
            if (avgPx.compareTo(markPx) > 0) {
//                log.info("开始加仓...");
                log.info("开始加仓...");
                if (queueKaiCang.isEmpty()) {
                    // 队列为空
//                    log.info("开始加仓,但是超出了网格设置...");
@@ -139,29 +139,29 @@
                }
                DescBigDecimal kaiCang = queueKaiCang.peek();
                if (kaiCang != null && markPx.compareTo(kaiCang.getValue()) <= 0 && avgPx.compareTo(kaiCang.getValue()) >= 0) {
//                    log.info("开始加仓...开仓队列价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
                    log.info("开始加仓...开仓队列价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
                    boolean buyCntTimeFlag = buyCntTimeEvent(avgPx, markPx);
                    if (buyCntTimeFlag){
//                        log.info("加仓参数准备成功......");
                        log.info("加仓参数准备成功......");
                        return OrderParamEnums.BUY.getValue();
                    }else{
                        log.error("加仓参数准备失败......");
                        return null;
                    }
                } else {
//                    log.info("未触发加仓......，等待");
                    log.info("未触发加仓......，等待");
                    return OrderParamEnums.HOLDING.getValue();
                }
            } else if (avgPx.compareTo(markPx) < 0) {
//                log.info("开始减仓...");
                log.info("开始减仓...");
                if (queuePingCang.isEmpty()) {
                    // 队列为空
//                    log.info("开始减仓,但是超出了网格设置...");
                    log.info("开始减仓,但是超出了网格设置...");
                    return OrderParamEnums.HOLDING.getValue();
                }
                AscBigDecimal pingCang = queuePingCang.peek();
                if (pingCang != null && markPx.compareTo(pingCang.getValue()) >= 0 && avgPx.compareTo(pingCang.getValue()) < 0) {
//                    log.info("开始减仓...平仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
                    log.info("开始减仓...平仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
                    // 判断当前是否盈利
                    BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
                    BigDecimal imr = PositionsWs.POSITIONSWSMAP.get("imr");
@@ -172,26 +172,26 @@
                    if (realizedPnlValue.compareTo(BigDecimal.ZERO) <= 0) {
                        BigDecimal realizedPnlValueZheng = realizedPnlValue.multiply(new BigDecimal("-1"));
                        if (uplValue.compareTo(realizedPnlValue) > 0 && uplValue.compareTo(imrValue.add(realizedPnlValueZheng))  >= 0) {
//                            log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
                            log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
                            return OrderParamEnums.SELL.getValue();
                        }else{
//                            log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
                            log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
                            return OrderParamEnums.HOLDING.getValue();
                        }
                    }else {
                        if (uplValue.compareTo(imrValue)  >= 0) {
//                            log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
                            log.info("当前未实现盈亏：{}大于预计收益>{}，赚钱咯", uplValue, imrValue);
                            return OrderParamEnums.SELL.getValue();
                        }else{
//                            log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
                            log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
                            return OrderParamEnums.HOLDING.getValue();
                        }
                    }
                } else {
//                    log.info("未触发减仓......，等待");
                    log.info("未触发减仓......，等待");
                }
            } else {
//                log.info("价格波动较小......，等待");
                log.info("价格波动较小......，等待");
            }
            return null;
        } catch (NumberFormatException e) {
@@ -222,7 +222,7 @@
        if (orderPrice == null) {
            return;
        }
//        log.info("需要移除的价格: {}", orderPrice);
        log.info("需要移除的价格: {}", orderPrice);

        BigDecimal priceDecimal;
        try {
@@ -236,34 +236,34 @@
        queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);

        // 打印开仓队列
//        StringBuilder kaiCangStr = new StringBuilder();
//        kaiCangStr.append("开仓队列: [");
//        boolean first = true;
//        for (DescBigDecimal item : queueKaiCang) {
//            if (!first) {
//                kaiCangStr.append(", ");
//            }
//            kaiCangStr.append(item.getValue());
//            first = false;
//        }
//        kaiCangStr.append("]");
//        log.info(kaiCangStr.toString());
        StringBuilder kaiCangStr = new StringBuilder();
        kaiCangStr.append("开仓队列: [");
        boolean first = true;
        for (DescBigDecimal item : queueKaiCang) {
            if (!first) {
                kaiCangStr.append(", ");
            }
            kaiCangStr.append(item.getValue());
            first = false;
        }
        kaiCangStr.append("]");
        log.info(kaiCangStr.toString());

        // 删除比该价格小的数据
        queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);

        // 打印平仓队列
//        StringBuilder pingCangStr = new StringBuilder();
//        pingCangStr.append("平仓队列: [");
//        first = true;
//        for (AscBigDecimal item : queuePingCang) {
//            if (!first) {
//                pingCangStr.append(", ");
//            }
//            pingCangStr.append(item.getValue());
//            first = false;
//        }
//        pingCangStr.append("]");
//        log.info(pingCangStr.toString());
        StringBuilder pingCangStr = new StringBuilder();
        pingCangStr.append("平仓队列: [");
        first = true;
        for (AscBigDecimal item : queuePingCang) {
            if (!first) {
                pingCangStr.append(", ");
            }
            pingCangStr.append(item.getValue());
            first = false;
        }
        pingCangStr.append("]");
        log.info(pingCangStr.toString());
    }
}

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

@@ -73,7 +73,7 @@

                String instId = detail.getString(INSTID_KEY);
                if (!CoinEnums.HE_YUE.getCode().equals(instId)){
//                    log.info( "订单详情-币种: {} 没有成交订单", CoinEnums.HE_YUE.getCode() );
                    log.info( "订单详情-币种: {} 没有成交订单", CoinEnums.HE_YUE.getCode() );
                    continue;
                }
                String ordId = detail.getString(ORDID_KEY);
@@ -84,12 +84,12 @@
                String avgPx = detail.getString(AVGPX_KEY);
                String state = detail.getString(STATE_KEY);

//                log.info(
//                        "订单详情-币种: {}, 系统编号: {}, 自定义编号: {}, 订单方向: {}, 交易模式: {}," +
//                                " 累计成交数量: {}, 成交均价: {}, 订单状态: {}",
//                        instId, ordId, clOrdId, side, tdMode,
//                        accFillSz, avgPx,state
//                );
                log.info(
                        "订单详情-币种: {}, 系统编号: {}, 自定义编号: {}, 订单方向: {}, 交易模式: {}," +
                                " 累计成交数量: {}, 成交均价: {}, 订单状态: {}",
                        instId, ordId, clOrdId, side, tdMode,
                        accFillSz, avgPx,state
                );

                String clOrdIdStr = TradeOrderWs.TRADEORDERWSMAP.get("clOrdId");
                String stateStr = TradeOrderWs.TRADEORDERWSMAP.get("state");
@@ -108,7 +108,7 @@
                    WsMapBuild.saveBigDecimalToMap(PositionsWs.POSITIONSWSMAP, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));
                    WsMapBuild.saveStringToMap(AccountWs.ACCOUNTWSMAP, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());

//                    log.info("订单详情已完成: {}, 自定义编号: {}", CoinEnums.HE_YUE.getCode(), clOrdId);
                    log.info("订单详情已完成: {}, 自定义编号: {}", CoinEnums.HE_YUE.getCode(), clOrdId);
                }
            }
        } catch (Exception e) {

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

@@ -31,13 +31,13 @@
//        log.info("开始执行TradeOrderWs......");
        String accountReadyState = AccountWs.ACCOUNTWSMAP.get(CoinEnums.READY_STATE.name());
        if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
//            log.info("账户通道未就绪，取消发送");
            log.info("账户通道未就绪，取消发送");
            return;
        }
        BigDecimal positionsReadyState = PositionsWs.POSITIONSWSMAP.get(CoinEnums.READY_STATE.name()) == null
                ? BigDecimal.ZERO : PositionsWs.POSITIONSWSMAP.get(CoinEnums.READY_STATE.name());
        if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
//            log.info("仓位通道未就绪，取消发送");
            log.info("仓位通道未就绪，取消发送");
            return;
        }
        // 校验必要参数
@@ -47,23 +47,23 @@
        }
        String buyCnt = "";
        if (OrderParamEnums.HOLDING.getValue().equals(side)){
//            log.info("当前状态为持仓中，取消发送");
            log.info("当前状态为持仓中，取消发送");
            return;
        }else if (OrderParamEnums.OUT.getValue().equals(side)){
//            log.info("当前状态为止损");
            log.info("当前状态为止损");
            side = OrderParamEnums.SELL.getValue();
            buyCnt = String.valueOf(PositionsWs.POSITIONSWSMAP.get("pos"));
        }else if (OrderParamEnums.INIT.getValue().equals(side)){
//            log.info("当前状态为初始化");
            log.info("当前状态为初始化");
            side = OrderParamEnums.BUY.getValue();
            buyCnt = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT.name());
        }else if (OrderParamEnums.BUY.getValue().equals(side)){
//            log.info("当前状态为加仓");
            log.info("当前状态为加仓");
            String buyCntTime = TRADEORDERWSMAP.get("buyCntTime");
            String buyCntStr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.BUY_CNT.name());
            buyCnt = String.valueOf(new BigDecimal(buyCntTime).multiply(new BigDecimal(buyCntStr)));
        }else if (OrderParamEnums.SELL.getValue().equals(side)){
//            log.info("当前状态为减仓");
            log.info("当前状态为减仓");
            buyCnt = String.valueOf(PositionsWs.POSITIONSWSMAP.get("pos"));
        }else{
            log.warn("交易状态异常，取消发送");
@@ -91,7 +91,7 @@
            String connId = WsParamBuild.getOrderNum(ORDERWS_CHANNEL);
            JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, ORDERWS_CHANNEL, argsArray);
            webSocketClient.send(jsonObject.toJSONString());
//            log.info("发送下单频道:{},数量：{}", side, buyCnt);
            log.info("发送下单频道:{},数量：{}", side, buyCnt);

            WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "buyCntTime",String.valueOf(BigDecimal.ONE));
            WsMapBuild.saveStringToMap(TRADEORDERWSMAP, "clOrdId", clOrdId);