Administrator
2025-12-10 846745085599efb486ceccd4a9b9e403e5e73769
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -145,6 +145,14 @@
                    side = OrderParamEnums.BUY.getValue();
                    redisUtils.set(positionsOrderPriceKey, String.valueOf(kaiCang.getValue()), 0);
                } else {
                    //判断是否加仓(当前持仓过小,可以加仓)
                    boolean isAddCang = doAddCang();
                    log.info("加仓过程中发现持仓过小 :{}",isAddCang);
                    if (isAddCang){
                        log.info("触发加仓......,持仓过小");
                        redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
                        return OrderParamEnums.BUY.getValue();
                    }
                    log.info("未触发加仓......,等待");
                }
            } else if (avgPx.compareTo(markPx) < 0) {
@@ -173,9 +181,11 @@
                                return OrderParamEnums.SELL.getValue();
                            }else{
                                //判断是否加仓(当前持仓过小,可以加仓)
                                boolean isAddCang = doAddCang(imrValue);
                                log.info("减仓过程中没有收获,发现是持仓过小 :{}",isAddCang);
                                boolean isAddCang = doAddCang();
                                log.info("减仓过程中发现持仓过小 :{}",isAddCang);
                                if (isAddCang){
                                    log.info("触发加仓......,持仓过小");
                                    redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
                                    return OrderParamEnums.BUY.getValue();
                                }
                                log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue);
@@ -189,11 +199,12 @@
                                redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                return OrderParamEnums.SELL.getValue();
                            }else{
                                //判断是否加仓(当前持仓过小,可以加仓)
                                boolean isAddCang = doAddCang(imrValue);
                                log.info("减仓过程中没有收获,发现是持仓过小 :{}",isAddCang);
                                boolean isAddCang = doAddCang();
                                log.info("减仓过程中发现持仓过小 :{}",isAddCang);
                                if (isAddCang){
                                    log.info("触发加仓......,持仓过小");
                                    redisUtils.set(positionsOrderPriceKey, String.valueOf(markPx), 0);
                                    return OrderParamEnums.BUY.getValue();
                                }
                                log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue);
@@ -218,7 +229,9 @@
        }
    }
    private boolean doAddCang(BigDecimal imrValue) {
    private boolean doAddCang() {
        String imr = (String) redisUtils.get(positionsImrKey);
        BigDecimal imrValue = new BigDecimal(StrUtil.isBlank(imr) ? "0" : imr);
        String everyTimeUsdt = (String) redisUtils.get(AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":everyTimeUsdt");
        BigDecimal everyTimeUsdtValue = new BigDecimal(everyTimeUsdt);
        return everyTimeUsdtValue.compareTo(imrValue) >= 0;
@@ -247,8 +260,8 @@
            log.warn("无效的价格格式: {}", orderPrice);
            return;
        }
        // 删除比该价格大的数据(由于是降序队列,所以是删除value.compareTo(priceDecimal) < 0的元素)
        queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
        // 删除比该价格大的数据
        queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
        // 打印开仓队列
        StringBuilder kaiCangStr = new StringBuilder();
        kaiCangStr.append("开仓队列: [");
@@ -263,8 +276,8 @@
        kaiCangStr.append("]");
        log.info(kaiCangStr.toString());
        // 删除比该价格小的数据(由于是升序队列,所以是删除value.compareTo(priceDecimal) > 0的元素)
        queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
        // 删除比该价格小的数据
        queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
        // 打印平仓队列
        StringBuilder pingCangStr = new StringBuilder();