From 3e09eb864f92c821b8d69c5110175d7c2382e4df Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sun, 04 Jan 2026 14:26:10 +0800
Subject: [PATCH] refactor(okxNewPrice): 移除调试日志
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy.java | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy.java
index be65136..8de14fa 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy.java
@@ -93,6 +93,8 @@
// 1. 计算MACD指标
MACDResult macdResult = MACDCalculator.calculateMACD(
closePrices, shortPeriod, longPeriod, signalPeriod);
+ log.info( "MACD计算结果：{}", macdResult.getMacdData().get( macdResult.getMacdData().size() -1));
+
// 2. 计算波动率
Volatility volatility = new Volatility(volatilityPeriod);
@@ -242,14 +244,12 @@
// 5. 底背离检查（增强多头信号可靠性）
boolean isBottomDivergence = MACDCalculator.isBottomDivergence(closePrices, macdResult);
+
+ log.info("多头信号形成, MACD有利状态: {}, 柱状线为正: {}, 波动率过滤: {}, 底背离: {}",
+ isMacdFavorable, macdPositive, volatilityFilter, isBottomDivergence);
// 所有条件必须同时满足
boolean result = macdPositive && volatilityFilter && (isMacdFavorable || isBottomDivergence);
-
- if (result) {
- log.info("多头信号形成, MACD有利状态: {}, 柱状线为正: {}, 波动率过滤: {}, 底背离: {}",
- isMacdFavorable, macdPositive, volatilityFilter, isBottomDivergence);
- }
return result;
}
@@ -274,14 +274,11 @@
// 5. 顶背离检查（增强空头信号可靠性）
boolean isTopDivergence = MACDCalculator.isTopDivergence(closePrices, macdResult);
-
+
+ log.info("空头信号形成, MACD有利状态: {}, 柱状线为负: {}, 波动率过滤: {}, 顶背离: {}",
+ isMacdFavorable, macdNegative, volatilityFilter, isTopDivergence);
// 所有条件必须同时满足
boolean result = macdNegative && volatilityFilter && (isMacdFavorable || isTopDivergence);
-
- if (result) {
- log.info("空头信号形成, MACD有利状态: {}, 柱状线为负: {}, 波动率过滤: {}, 顶背离: {}",
- isMacdFavorable, macdNegative, volatilityFilter, isTopDivergence);
- }
return result;
}
@@ -357,15 +354,13 @@
boolean isGoldenCross = prevPrev.getDif().compareTo(prevPrev.getDea()) <= 0 &&
previous.getDif().compareTo(previous.getDea()) > 0;
- boolean isUp = latest.getDif().compareTo(BigDecimal.ZERO) > 0 && latest.getDea().compareTo(BigDecimal.ZERO) > 0;
-
// 柱状线扩张判断：连续正值且绝对值增大
boolean isExpanding = latest.getMacdHist().compareTo(BigDecimal.ZERO) > 0 &&
previous.getMacdHist().compareTo(BigDecimal.ZERO) > 0 &&
previous.getMacdHist().abs().compareTo(latest.getMacdHist().abs()) < 0;
- // 金叉或柱状线扩张任一满足即可
- return isGoldenCross && isExpanding && isUp;
+ // 金叉柱状线扩张满足
+ return isGoldenCross && isExpanding;
}
/**
@@ -390,14 +385,14 @@
}
/**
- * MACD死叉且柱状线收缩检查
+ * MACD死叉且柱状线扩张检查
* <p>
* 条件：
* 1. DIF线从上往下穿过DEA线（死叉）
- * 2. MACD柱状线绝对值减小且为负值（动量减弱）
+ * 2. MACD柱状线绝对值增大且为负值（动量增强）
*
* @param macdResult MACD计算结果
- * @return 是否形成MACD死叉或柱状线收缩
+ * @return 是否形成MACD死叉且柱状线扩张
*/
private boolean isMacdDeathCrossAndContracting(MACDResult macdResult) {
List<PriceData> macdData = macdResult.getMacdData();
@@ -413,15 +408,13 @@
boolean isDeathCross = prevPrev.getDif().compareTo(prevPrev.getDea()) >= 0 &&
previous.getDif().compareTo(previous.getDea()) < 0;
- boolean isDown = latest.getDif().compareTo(BigDecimal.ZERO) < 0 && latest.getDea().compareTo(BigDecimal.ZERO) < 0;
-
// 优化后的死叉柱状线条件：空头趋势中，死叉应伴随柱状线扩张（绝对值增大）
boolean isExpanding = latest.getMacdHist().compareTo(BigDecimal.ZERO) < 0 &&
previous.getMacdHist().compareTo(BigDecimal.ZERO) < 0 &&
previous.getMacdHist().abs().compareTo(latest.getMacdHist().abs()) < 0;
- // 死叉或柱状线收缩任一满足即可
- return isDeathCross && isExpanding && isDown;
+ // 死叉且柱状线扩张
+ return isDeathCross && isExpanding;
}
/**
--
Gitblit v1.9.1