From 97b7f914d060b2a052299416384fc80e061f4b1d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 06 Jan 2026 13:49:58 +0800
Subject: [PATCH] refactor(MacdEmaStrategy): 调整多头和空头开仓条件的逻辑顺序

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/indicator/macdAndMatrategy/MacdMaStrategy.java |  789 +++++++++++++++++++++++++-------------------------------
 1 files changed, 352 insertions(+), 437 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 4c47269..f5ebaf3 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
@@ -1,150 +1,56 @@
 /**
  * MACD和MA组合交易策略实现类
- * 基于15分钟K线数据生成交易信号并确定持仓方向
+ * 基于多时间粒度K线数据生成交易信号并确定持仓方向
  *
  * 该策略综合考虑了EMA指标、MACD指标、价格突破信号和波动率因素,
  * 形成了一套完整的开仓、平仓和持仓管理机制。
+ * 支持1分钟(K线)和日线(K线)级别的数据输入,数据顺序要求从新到旧排列。
  */
 package com.xcong.excoin.modules.okxNewPrice.indicator.macdAndMatrategy;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
  * MACD和MA组合交易策略实现
  * <p>
  * 该策略利用EMA交叉、MACD指标、价格突破信号和波动率过滤,
- * 为15分钟K线级别交易提供综合决策支持。
+ * 为多时间粒度K线级别交易提供综合决策支持。
+ * <p>
+ * 数据输入要求:
+ * - historicalPrices1M:1分钟K线收盘价列表,顺序从新到旧
+ * - historicalPrices1D:日线K线收盘价列表,顺序从新到旧
  */
+@Slf4j
 public class MacdMaStrategy {
+
+    /** 操作类型枚举 */
+    public enum OperationType {
+        /** 开仓 */
+        open,
+        /** 平仓 */
+        close
+    }
 
     /** 持仓状态枚举 */
     public enum PositionType {
-        /** 多头持仓 */
-        LONG,
-        /** 空头持仓 */
-        SHORT,
+        /** 多头开仓 */
+        LONG_BUY,
+        /** 多头平仓 */
+        LONG_SELL,
+        /** 空头开仓 */
+        SHORT_SELL,
+        /** 空头平仓 */
+        SHORT_BUY,
         /** 空仓 */
         NONE
     }
 
-    // 策略参数
-    private int shortPeriod;      // 短期EMA周期
-    private int longPeriod;       // 长期EMA周期
-    private int signalPeriod;     // MACD信号线周期
-    private int volatilityPeriod; // 波动率计算周期
-    private BigDecimal stopLossRatio;   // 止损比例
-    private BigDecimal takeProfitRatio; // 止盈比例
-
-    // 持仓信息
-    private PositionType currentPosition; // 当前持仓状态
-    private BigDecimal entryPrice;       // 开仓价格
-    private long entryTime;              // 开仓时间戳
-
-    /**
-     * 默认构造函数,使用标准MACD参数
-     * 短期周期=12, 长期周期=26, 信号线周期=9, 波动率周期=20
-     * 止损比例=1%, 止盈比例=2%
-     */
-    public MacdMaStrategy() {
-        this(12, 26, 9, 20, new BigDecimal("0.01"), new BigDecimal("0.02"));
-    }
-
-    /**
-     * 自定义参数构造函数
-     *
-     * @param shortPeriod 短期EMA周期
-     * @param longPeriod 长期EMA周期
-     * @param signalPeriod MACD信号线周期
-     * @param volatilityPeriod 波动率计算周期
-     * @param stopLossRatio 止损比例
-     * @param takeProfitRatio 止盈比例
-     */
-    public MacdMaStrategy(int shortPeriod, int longPeriod, int signalPeriod, int volatilityPeriod,
-                          BigDecimal stopLossRatio, BigDecimal takeProfitRatio) {
-        this.shortPeriod = shortPeriod;
-        this.longPeriod = longPeriod;
-        this.signalPeriod = signalPeriod;
-        this.volatilityPeriod = volatilityPeriod;
-        this.stopLossRatio = stopLossRatio;
-        this.takeProfitRatio = takeProfitRatio;
-
-        // 初始化持仓状态为空仓
-        this.currentPosition = PositionType.NONE;
-        this.entryPrice = BigDecimal.ZERO;
-        this.entryTime = 0;
-    }
-
-    /**
-     * 分析最新价格数据并生成交易信号
-     *
-     * @param closePrices 收盘价序列
-     * @return 生成的交易信号(LONG、SHORT或NONE)
-     */
-    public PositionType analyze(List<BigDecimal> closePrices) {
-        // 数据检查:确保有足够的数据点进行计算
-        if (closePrices == null || closePrices.size() < 34) {
-            return PositionType.NONE; // 数据不足,无法生成信号
-        }
-
-        // 1. 计算MACD指标
-        MACDResult macdResult = MACDCalculator.calculateMACD(
-                closePrices, shortPeriod, longPeriod, signalPeriod);
-
-        // 2. 计算波动率
-        Volatility volatility = new Volatility(volatilityPeriod);
-        for (int i = Math.max(0, closePrices.size() - volatilityPeriod);
-             i < closePrices.size(); i++) {
-            volatility.addPrice(closePrices.get(i));
-        }
-        volatility.calculate();
-
-        // 最新收盘价
-        BigDecimal latestPrice = closePrices.get(closePrices.size() - 1);
-
-        // 3. 检查开仓条件
-        if (currentPosition == PositionType.NONE) {
-            // 多头开仓条件检查
-            if (isLongEntryCondition(macdResult, closePrices, volatility.getValue())) {
-                // 执行开多
-                this.currentPosition = PositionType.LONG;
-                this.entryPrice = latestPrice;
-                this.entryTime = System.currentTimeMillis();
-                return PositionType.LONG;
-            }
-
-            // 空头开仓条件检查
-            if (isShortEntryCondition(macdResult, closePrices, volatility.getValue())) {
-                // 执行开空
-                this.currentPosition = PositionType.SHORT;
-                this.entryPrice = latestPrice;
-                this.entryTime = System.currentTimeMillis();
-                return PositionType.SHORT;
-            }
-
-            // 无信号
-            return PositionType.NONE;
-        } else {
-            // 4. 检查平仓条件
-            if (shouldClosePosition(macdResult, closePrices, latestPrice)) {
-                // 执行平仓
-                PositionType closedPosition = currentPosition;
-                this.currentPosition = PositionType.NONE;
-                this.entryPrice = BigDecimal.ZERO;
-                this.entryTime = 0;
-                return PositionType.NONE; // 返回空仓信号表示平仓
-            }
-
-            // 保持当前持仓
-            return currentPosition;
-        }
-    }
-
-    /**
-     * 交易指令类,封装side和posSide的组合
-     */
+    /** 交易指令类,封装side和posSide的组合 */
     public static class TradingOrder {
         private String side;    // buy或sell
         private String posSide; // long或short
@@ -168,391 +74,400 @@
         }
     }
 
+    // 策略参数
+    private int shortPeriod;      // 短期EMA周期
+    private int longPeriod;       // 长期EMA周期
+    private int signalPeriod;     // MACD信号线周期
+    private int volatilityPeriod; // 波动率计算周期
+    private int trendPeriod = 200; // 趋势过滤EMA周期(200日)
+    private BigDecimal stopLossRatio;   // 止损比例
+    private BigDecimal takeProfitRatio; // 止盈比例
+
+    /**
+     * 默认构造函数,使用标准MACD参数
+     * 短期周期=12, 长期周期=26, 信号线周期=9, 波动率周期=20
+     * 止损比例=1%, 止盈比例=2%
+     */
+    public MacdMaStrategy() {
+        this(12, 26, 9, 20, new BigDecimal("0.01"), new BigDecimal("0.02"));
+    }
+
+    /**
+     * 自定义参数构造函数,使用默认趋势周期200
+     *
+     * @param shortPeriod 短期EMA周期
+     * @param longPeriod 长期EMA周期
+     * @param signalPeriod MACD信号线周期
+     * @param volatilityPeriod 波动率计算周期
+     * @param stopLossRatio 止损比例
+     * @param takeProfitRatio 止盈比例
+     */
+    public MacdMaStrategy(int shortPeriod, int longPeriod, int signalPeriod, int volatilityPeriod,
+                          BigDecimal stopLossRatio, BigDecimal takeProfitRatio) {
+        this(shortPeriod, longPeriod, signalPeriod, volatilityPeriod, 200, stopLossRatio, takeProfitRatio);
+    }
+
+    /**
+     * 自定义参数构造函数
+     *
+     * @param shortPeriod 短期EMA周期
+     * @param longPeriod 长期EMA周期
+     * @param signalPeriod MACD信号线周期
+     * @param volatilityPeriod 波动率计算周期
+     * @param trendPeriod 趋势过滤EMA周期(200日)
+     * @param stopLossRatio 止损比例
+     * @param takeProfitRatio 止盈比例
+     */
+    public MacdMaStrategy(int shortPeriod, int longPeriod, int signalPeriod, int volatilityPeriod, int trendPeriod,
+                          BigDecimal stopLossRatio, BigDecimal takeProfitRatio) {
+        this.shortPeriod = shortPeriod;
+        this.longPeriod = longPeriod;
+        this.signalPeriod = signalPeriod;
+        this.volatilityPeriod = volatilityPeriod;
+        this.trendPeriod = trendPeriod;
+        this.stopLossRatio = stopLossRatio;
+        this.takeProfitRatio = takeProfitRatio;
+    }
+
+    // 主流程方法
+    
     /**
      * 分析历史价格数据并生成交易指令
      *
-     * @param historicalPrices 历史价格序列
+     * @param historicalPrices 历史价格序列(1分钟K线收盘价),顺序从新到旧
+     * @param historical1DayPrices 日线历史价格序列,顺序从新到旧
+     * @param operation 操作类型(open/close)
      * @return 交易指令(包含side和posSide),如果没有交易信号则返回null
      */
-    public TradingOrder generateTradingOrder(List<BigDecimal> historicalPrices) {
-        PositionType signal = analyze(historicalPrices);
+    public TradingOrder generateTradingOrder(List<BigDecimal> historicalPrices, List<BigDecimal> historical1DayPrices, String operation) {
+        PositionType signal = null;
 
-        // 根据信号和当前持仓状态生成交易指令
-        if (signal == PositionType.LONG) {
-            // 开多:买入开多(side 填写 buy; posSide 填写 long )
-            return new TradingOrder("buy", "long");
-        } else if (signal == PositionType.SHORT) {
-            // 开空:卖出开空(side 填写 sell; posSide 填写 short )
-            return new TradingOrder("sell", "short");
-        } else if (signal == PositionType.NONE && currentPosition != PositionType.NONE) {
-            // 平仓操作
-            if (currentPosition == PositionType.LONG) {
-                // 平多:卖出平多(side 填写 sell;posSide 填写 long )
-                return new TradingOrder("sell", "long");
-            } else if (currentPosition == PositionType.SHORT) {
-                // 平空:买入平空(side 填写 buy; posSide 填写 short )
-                return new TradingOrder("buy", "short");
-            }
+        if (OperationType.open.name().equals(operation)) {
+            signal = analyzeOpen(historicalPrices, historical1DayPrices);
+        } else if (OperationType.close.name().equals(operation)) {
+            signal = analyzeClose(historicalPrices, historical1DayPrices);
         }
-
-        // 没有交易信号
-        return null;
+        
+        // 根据信号生成交易指令
+        return convertSignalToTradingOrder(signal);
     }
 
+    /**
+     * 分析最新价格数据并生成开仓信号
+     *
+     * @param closePrices 1分钟K线收盘价序列,顺序从新到旧
+     * @param close1DPrices 日线K线收盘价序列,顺序从新到旧
+     * @return 生成的交易信号(LONG_BUY、SHORT_SELL或NONE)
+     */
+    public PositionType analyzeOpen(List<BigDecimal> closePrices, List<BigDecimal> close1DPrices) {
+        // 数据检查:确保有足够的数据点进行计算(需要足够数据计算200日EMA)
+        if (closePrices == null || closePrices.size() < Math.max(34, trendPeriod) || 
+            close1DPrices == null || close1DPrices.size() < Math.max(34, trendPeriod)) {
+            return PositionType.NONE; // 数据不足,无法生成信号
+        }
+
+        // 计算MACD指标
+        MACDResult macdResult = MACDCalculator.calculateMACD(
+                closePrices, shortPeriod, longPeriod, signalPeriod);
+         log.info("MACD计算结果:{}", macdResult.getMacdData().get(0));
+
+        // 多头开仓条件检查
+        if (isLongEntryCondition(macdResult, closePrices, close1DPrices)) {
+            log.info("多头开仓信号,价格:{}", closePrices.get(0));
+            return PositionType.LONG_BUY;
+        }
+
+        // 空头开仓条件检查
+        if (isShortEntryCondition(macdResult, closePrices, close1DPrices)) {
+            log.info("空头开仓信号,价格:{}", closePrices.get(0));
+            return PositionType.SHORT_SELL;
+        }
+        
+        // 无信号
+        return PositionType.NONE;
+    }
+
+    /**
+     * 分析最新价格数据并生成平仓信号
+     *
+     * @param closePrices 1分钟K线收盘价序列,顺序从新到旧
+     * @param close1DPrices 日线K线收盘价序列,顺序从新到旧
+     * @return 生成的交易信号(LONG_SELL、SHORT_BUY或NONE)
+     */
+    public PositionType analyzeClose(List<BigDecimal> closePrices, List<BigDecimal> close1DPrices) {
+        // 数据检查:确保有足够的数据点进行计算
+        if (closePrices == null || closePrices.size() < Math.max(34, trendPeriod) || 
+            close1DPrices == null || close1DPrices.size() < Math.max(34, trendPeriod)) {
+            return PositionType.NONE; // 数据不足,无法生成信号
+        }
+
+        // 计算MACD指标
+        MACDResult macdResult = MACDCalculator.calculateMACD(
+                closePrices, shortPeriod, longPeriod, signalPeriod);
+
+        // 最新收盘价
+        BigDecimal latestPrice = closePrices.get(0);
+
+        if (isLongExitCondition(macdResult, latestPrice)) {
+            log.info("多头平仓信号,价格:{}", latestPrice);
+            return PositionType.LONG_SELL;
+        }
+        
+        if (isShortExitCondition(macdResult, latestPrice)) {
+            log.info("空头平仓信号,价格:{}", latestPrice);
+            return PositionType.SHORT_BUY;
+        }
+
+        // 无信号
+        return PositionType.NONE;
+    }
+
+    // 信号转换方法
+    
+    /**
+     * 将持仓信号转换为交易指令
+     *
+     * @param signal 持仓信号
+     * @return 交易指令,无信号则返回null
+     */
+    private TradingOrder convertSignalToTradingOrder(PositionType signal) {
+        if (signal == null) {
+            return null;
+        }
+        
+        switch (signal) {
+            case LONG_BUY:
+                // 开多:买入开多(side 填写 buy; posSide 填写 long )
+                return new TradingOrder("buy", "long");
+            case LONG_SELL:
+                // 平多:卖出平多(side 填写 sell; posSide 填写 long )
+                return new TradingOrder("sell", "long");
+            case SHORT_SELL:
+                // 开空:卖出开空(side 填写 sell; posSide 填写 short )
+                return new TradingOrder("sell", "short");
+            case SHORT_BUY:
+                // 平空:买入平空(side 填写 buy; posSide 填写 short )
+                return new TradingOrder("buy", "short");
+            default:
+                // 无信号
+                return null;
+        }
+    }
+
+    // 开仓条件检查方法
+    
     /**
      * 多头开仓条件检查
      *
      * @param macdResult MACD计算结果
-     * @param closePrices 收盘价序列
-     * @param volatility 当前波动率
+     * @param closePrices 1分钟K线收盘价序列,顺序从新到旧
+     * @param close1DPrices 日线K线收盘价序列,顺序从新到旧
      * @return 是否满足多头开仓条件
      */
-    private boolean isLongEntryCondition(MACDResult macdResult, List<BigDecimal> closePrices,
-                                         BigDecimal volatility) {
-        // 1. EMA金叉检查(短期EMA > 长期EMA)
-        boolean emaGoldenCross = isEmaGoldenCross(macdResult);
+    private boolean isLongEntryCondition(MACDResult macdResult, List<BigDecimal> closePrices, List<BigDecimal> close1DPrices) {
+        // 1. 计算200日EMA(趋势过滤)
+        // 复制并反转日线数据,确保从旧到新计算EMA
+        List<BigDecimal> reversed1DPrices = new ArrayList<>(close1DPrices);
+        Collections.reverse(reversed1DPrices);
+        List<BigDecimal> trendEma = EMACalculator.calculateEMA(reversed1DPrices, trendPeriod, true);
+        BigDecimal latestTrendEma = trendEma.get(trendEma.size() - 1);
+        BigDecimal latestPrice = closePrices.get(0);
+        log.info( "200日EMA:{}, 最新价格:{}", latestTrendEma,  latestPrice);
+        
+        // 2. 价格必须位于200日EMA上方(多头趋势确认)
+        boolean isAboveTrend = latestPrice.compareTo(latestTrendEma) > 0;
+        
+        // 3. MACD金叉检查
+        boolean isGoldenCross = isGoldenCross(macdResult);
+        
+        // 4. MACD柱状线由负转正(动量转变)
+        boolean isMacdHistTurningPositive = isMacdHistTurningPositive(macdResult);
+        
+        // 5. 底背离检查(增强多头信号可靠性)
+        boolean isBottomDivergence = MACDCalculator.isBottomDivergence(closePrices, macdResult);
 
-        // 2. MACD柱状线扩张+金叉检查
-        boolean macdGoldenCross = isMacdGoldenCrossAndExpanding(macdResult);
-
-        // 3. 价格突破前高检查
-        boolean priceBreakout = BullishSignalDetector.isBullishSignalFormed(macdResult, closePrices);
-
-        // 4. 波动率过滤检查(0.5% ~ 5%)
-        boolean volatilityFilter = isVolatilityInRange(volatility);
-
-        // 所有条件必须同时满足
-        return emaGoldenCross && macdGoldenCross && priceBreakout && volatilityFilter;
+        log.info("多头信号检查, 价格位于200日EMA上方: {}, 金叉: {}, MACD柱状线由负转正: {}, 底背离: {}",
+                isAboveTrend, isGoldenCross, isMacdHistTurningPositive, isBottomDivergence);
+        
+        // 多头开仓条件:趋势向上 + 金叉 + (柱状线转强或底背离)
+        return isAboveTrend && isGoldenCross && (isMacdHistTurningPositive || isBottomDivergence);
     }
 
     /**
      * 空头开仓条件检查
-     *
+     * 
      * @param macdResult MACD计算结果
-     * @param closePrices 收盘价序列
-     * @param volatility 当前波动率
+     * @param closePrices 1分钟K线收盘价序列,顺序从新到旧
+     * @param close1DPrices 日线K线收盘价序列,顺序从新到旧
      * @return 是否满足空头开仓条件
      */
-    private boolean isShortEntryCondition(MACDResult macdResult, List<BigDecimal> closePrices,
-                                          BigDecimal volatility) {
-        // 1. EMA死叉检查(短期EMA < 长期EMA)
-        boolean emaDeathCross = isEmaDeathCross(macdResult);
+    private boolean isShortEntryCondition(MACDResult macdResult, List<BigDecimal> closePrices, List<BigDecimal> close1DPrices) {
+        // 1. 计算200日EMA(趋势过滤)
+        // 复制并反转日线数据,确保从旧到新计算EMA
+        List<BigDecimal> reversed1DPrices = new ArrayList<>(close1DPrices);
+        Collections.reverse(reversed1DPrices);
+        List<BigDecimal> trendEma = EMACalculator.calculateEMA(reversed1DPrices, trendPeriod, true);
+        BigDecimal latestTrendEma = trendEma.get(trendEma.size() - 1);
+        BigDecimal latestPrice = closePrices.get(0);
 
-        // 2. MACD柱状线收缩+死叉检查
-        boolean macdDeathCross = isMacdDeathCrossAndContracting(macdResult);
+        log.info( "200日EMA:{}, 最新价格:{}", latestTrendEma,  latestPrice);
+        
+        // 2. 价格必须位于200日EMA下方(空头趋势确认)
+        boolean isBelowTrend = latestPrice.compareTo(latestTrendEma) < 0;
+        
+        // 3. MACD死叉检查
+        boolean isDeathCross = isDeathCross(macdResult);
+        
+        // 4. MACD柱状线由正转负(动量转变)
+        boolean isMacdHistTurningNegative = isMacdHistTurningNegative(macdResult);
+        
+        // 5. 顶背离检查(增强空头信号可靠性)
+        boolean isTopDivergence = MACDCalculator.isTopDivergence(closePrices, macdResult);
 
-        // 3. 价格跌破前低检查
-        boolean priceBreakdown = BearishSignalDetector.isBearishSignalFormed(macdResult, closePrices);
-
-        // 4. 波动率过滤检查(0.5% ~ 5%)
-        boolean volatilityFilter = isVolatilityInRange(volatility);
-
-        // 所有条件必须同时满足
-        return emaDeathCross && macdDeathCross && priceBreakdown && volatilityFilter;
+        log.info("空头信号检查, 价格位于200日EMA下方: {}, 死叉: {}, MACD柱状线由正转负: {}, 顶背离: {}",
+                isBelowTrend, isDeathCross, isMacdHistTurningNegative, isTopDivergence);
+        
+        // 空头开仓条件:趋势向下 + 死叉 + (柱状线转弱或顶背离)
+        return isBelowTrend && isDeathCross && (isMacdHistTurningNegative || isTopDivergence);
     }
 
+    // 平仓条件检查方法
+    
     /**
-     * 平仓条件检查
-     *
+     * 多头平仓条件检查
+     * 
      * @param macdResult MACD计算结果
-     * @param closePrices 收盘价序列
      * @param currentPrice 当前价格
-     * @return 是否应该平仓
+     * @return 是否满足多头平仓条件
      */
-    private boolean shouldClosePosition(MACDResult macdResult, List<BigDecimal> closePrices,
-                                        BigDecimal currentPrice) {
-        // 1. 检查止损条件
-        if (isStopLossTriggered(currentPrice)) {
-            return true;
-        }
+    private boolean isLongExitCondition(MACDResult macdResult, BigDecimal currentPrice) {
+        // 多头平仓条件:MACD柱状线动量减弱(由正转弱)
+        List<PriceData> macdData = macdResult.getMacdData();
+        if (macdData.size() >= 2) {
+            PriceData latest = macdData.get(0); // 最新数据
+            PriceData previous = macdData.get(1); // 前一个数据
 
-        // 2. 检查止盈条件
-        if (isTakeProfitTriggered(currentPrice)) {
-            return true;
+            // 柱状线由正转弱:前一根为正,当前绝对值减小
+            boolean momentumWeakening = previous.getMacdHist().compareTo(BigDecimal.ZERO) >= 0 && 
+                                      latest.getMacdHist().abs().compareTo(previous.getMacdHist().abs()) < 0;
+            
+            return momentumWeakening;
         }
-
-        // 3. 检查MACD反向信号
-        if (isMacdReversalSignal(macdResult)) {
-            return true;
+        return false;
+    }
+    
+    /**
+     * 空头平仓条件检查
+     * 
+     * @param macdResult MACD计算结果
+     * @param currentPrice 当前价格
+     * @return 是否满足空头平仓条件
+     */
+    private boolean isShortExitCondition(MACDResult macdResult, BigDecimal currentPrice) {
+        // 空头平仓条件:MACD柱状线动量减弱(由负转弱)
+        List<PriceData> macdData = macdResult.getMacdData();
+        if (macdData.size() >= 2) {
+            PriceData latest = macdData.get(0); // 最新数据
+            PriceData previous = macdData.get(1); // 前一个数据
+            
+            // 柱状线由负转弱:前一根为负,当前绝对值减小
+            boolean momentumWeakening = previous.getMacdHist().compareTo(BigDecimal.ZERO) <= 0 &&
+                                      latest.getMacdHist().abs().compareTo(previous.getMacdHist().abs()) < 0;
+            
+            return momentumWeakening;
         }
-
+        
         return false;
     }
 
+    // MACD信号辅助方法
+    
     /**
-     * EMA金叉检查
-     *
+     * 简单金叉判断
+     * <p>
+     * 条件:DIF线从下往上穿过DEA线
+     * 
      * @param macdResult MACD计算结果
-     * @return 是否形成EMA金叉
+     * @return 是否形成金叉
      */
-    private boolean isEmaGoldenCross(MACDResult macdResult) {
+    private boolean isGoldenCross(MACDResult macdResult) {
         List<PriceData> macdData = macdResult.getMacdData();
         if (macdData.size() < 2) {
             return false;
         }
 
-        PriceData latest = macdData.get(macdData.size() - 1);
-        PriceData previous = macdData.get(macdData.size() - 2);
-
-        // 当前短期EMA > 当前长期EMA,并且前一期短期EMA <= 前一期长期EMA
-        return latest.getEmaShort().compareTo(latest.getEmaLong()) > 0 &&
-                previous.getEmaShort().compareTo(previous.getEmaLong()) <= 0;
+        PriceData latest = macdData.get(0);
+        PriceData previous = macdData.get(1);
+        
+        // 金叉判断:DIF从下往上穿过DEA
+        return previous.getDif().compareTo(previous.getDea()) < 0 && 
+               latest.getDif().compareTo(latest.getDea()) > 0;
     }
-
+    
     /**
-     * EMA死叉检查
-     *
+     * 简单死叉判断
+     * <p>
+     * 条件:DIF线从上往下穿过DEA线
+     * 
      * @param macdResult MACD计算结果
-     * @return 是否形成EMA死叉
+     * @return 是否形成死叉
      */
-    private boolean isEmaDeathCross(MACDResult macdResult) {
+    private boolean isDeathCross(MACDResult macdResult) {
         List<PriceData> macdData = macdResult.getMacdData();
         if (macdData.size() < 2) {
             return false;
         }
 
-        PriceData latest = macdData.get(macdData.size() - 1);
-        PriceData previous = macdData.get(macdData.size() - 2);
-
-        // 当前短期EMA < 当前长期EMA,并且前一期短期EMA >= 前一期长期EMA
-        return latest.getEmaShort().compareTo(latest.getEmaLong()) < 0 &&
-                previous.getEmaShort().compareTo(previous.getEmaLong()) >= 0;
+        PriceData latest = macdData.get(0);
+        PriceData previous = macdData.get(1);
+        
+        // 死叉判断:DIF从上往下穿过DEA
+        return previous.getDif().compareTo(previous.getDea()) > 0 && 
+               latest.getDif().compareTo(latest.getDea()) < 0;
     }
-
+    
     /**
-     * MACD金叉且柱状线扩张检查
-     *
+     * MACD柱状线由负转正判断
+     * <p>
+     * 条件:前一根柱状线为负,当前柱状线为正
+     * 
      * @param macdResult MACD计算结果
-     * @return 是否形成MACD金叉且柱状线扩张
+     * @return 是否由负转正
      */
-    private boolean isMacdGoldenCrossAndExpanding(MACDResult macdResult) {
+    private boolean isMacdHistTurningPositive(MACDResult macdResult) {
         List<PriceData> macdData = macdResult.getMacdData();
-        if (macdData.size() < 3) {
+        if (macdData.size() < 2) {
             return false;
         }
 
-        PriceData latest = macdData.get(macdData.size() - 1);
-        PriceData previous = macdData.get(macdData.size() - 2);
-        PriceData prevPrev = macdData.get(macdData.size() - 3);
-
-        // 1. MACD金叉检查(DIF上穿DEA)
-        boolean goldenCross = previous.getDif().compareTo(previous.getDea()) <= 0 &&
-                latest.getDif().compareTo(latest.getDea()) > 0;
-
-        // 2. MACD柱状线扩张检查
-        boolean histogramExpanding = prevPrev.getMacdHist().compareTo(previous.getMacdHist()) <= 0 &&
-                previous.getMacdHist().compareTo(latest.getMacdHist()) < 0 &&
-                latest.getMacdHist().compareTo(BigDecimal.ZERO) > 0;
-
-        return goldenCross && histogramExpanding;
+        PriceData latest = macdData.get(0); // 最新数据
+        PriceData previous = macdData.get(1); // 前一个数据
+        
+        // 柱状线由负转正:前一根为负,当前为正
+        return previous.getMacdHist().compareTo(BigDecimal.ZERO) <= 0 && 
+               latest.getMacdHist().compareTo(BigDecimal.ZERO) > 0;
     }
-
+    
     /**
-     * MACD死叉且柱状线收缩检查
-     *
+     * MACD柱状线由正转负判断
+     * <p>
+     * 条件:前一根柱状线为正,当前柱状线为负
+     * 
      * @param macdResult MACD计算结果
-     * @return 是否形成MACD死叉且柱状线收缩
+     * @return 是否由正转负
      */
-    private boolean isMacdDeathCrossAndContracting(MACDResult macdResult) {
+    private boolean isMacdHistTurningNegative(MACDResult macdResult) {
         List<PriceData> macdData = macdResult.getMacdData();
-        if (macdData.size() < 3) {
+        if (macdData.size() < 2) {
             return false;
         }
 
-        PriceData latest = macdData.get(macdData.size() - 1);
-        PriceData previous = macdData.get(macdData.size() - 2);
-        PriceData prevPrev = macdData.get(macdData.size() - 3);
-
-        // 1. MACD死叉检查(DIF下穿DEA)
-        boolean deathCross = previous.getDif().compareTo(previous.getDea()) >= 0 &&
-                latest.getDif().compareTo(latest.getDea()) < 0;
-
-        // 2. MACD柱状线收缩检查(绝对值减小)
-        boolean histogramContracting = prevPrev.getMacdHist().abs().compareTo(
-                previous.getMacdHist().abs()) >= 0 &&
-                previous.getMacdHist().abs().compareTo(
-                        latest.getMacdHist().abs()) > 0 &&
-                latest.getMacdHist().compareTo(BigDecimal.ZERO) < 0;
-
-        return deathCross && histogramContracting;
+        PriceData latest = macdData.get(0); // 最新数据
+        PriceData previous = macdData.get(1); // 前一个数据
+        
+        // 柱状线由正转负:前一根为正,当前为负
+        return previous.getMacdHist().compareTo(BigDecimal.ZERO) >= 0 && 
+               latest.getMacdHist().compareTo(BigDecimal.ZERO) < 0;
     }
 
-    /**
-     * 波动率过滤检查
-     *
-     * @param volatility 当前波动率
-     * @return 波动率是否在0.5%~5%范围内
-     */
-    private boolean isVolatilityInRange(BigDecimal volatility) {
-        BigDecimal minVolatility = new BigDecimal("0.5");
-        BigDecimal maxVolatility = new BigDecimal("5.0");
-
-        return volatility.compareTo(minVolatility) >= 0 &&
-                volatility.compareTo(maxVolatility) <= 0;
-    }
-
-    /**
-     * 止损触发检查
-     *
-     * @param currentPrice 当前价格
-     * @return 是否触发止损
-     */
-    private boolean isStopLossTriggered(BigDecimal currentPrice) {
-        if (entryPrice.compareTo(BigDecimal.ZERO) == 0) {
-            return false;
-        }
-
-        if (currentPosition == PositionType.LONG) {
-            // 多头持仓:价格下跌超过止损比例
-            BigDecimal stopLossPrice = entryPrice.multiply(
-                    BigDecimal.ONE.subtract(stopLossRatio));
-            return currentPrice.compareTo(stopLossPrice) < 0;
-        } else if (currentPosition == PositionType.SHORT) {
-            // 空头持仓:价格上涨超过止损比例
-            BigDecimal stopLossPrice = entryPrice.multiply(
-                    BigDecimal.ONE.add(stopLossRatio));
-            return currentPrice.compareTo(stopLossPrice) > 0;
-        }
-
-        return false;
-    }
-
-    /**
-     * 止盈触发检查
-     *
-     * @param currentPrice 当前价格
-     * @return 是否触发止盈
-     */
-    private boolean isTakeProfitTriggered(BigDecimal currentPrice) {
-        if (entryPrice.compareTo(BigDecimal.ZERO) == 0) {
-            return false;
-        }
-
-        if (currentPosition == PositionType.LONG) {
-            // 多头持仓:价格上涨超过止盈比例
-            BigDecimal takeProfitPrice = entryPrice.multiply(
-                    BigDecimal.ONE.add(takeProfitRatio));
-            return currentPrice.compareTo(takeProfitPrice) > 0;
-        } else if (currentPosition == PositionType.SHORT) {
-            // 空头持仓:价格下跌超过止盈比例
-            BigDecimal takeProfitPrice = entryPrice.multiply(
-                    BigDecimal.ONE.subtract(takeProfitRatio));
-            return currentPrice.compareTo(takeProfitPrice) < 0;
-        }
-
-        return false;
-    }
-
-    /**
-     * MACD反向信号检查
-     *
-     * @param macdResult MACD计算结果
-     * @return 是否出现MACD反向信号
-     */
-    private boolean isMacdReversalSignal(MACDResult macdResult) {
-        if (currentPosition == PositionType.LONG) {
-            // 多头持仓:检查MACD死叉信号
-            return isMacdDeathCrossAndContracting(macdResult);
-        } else if (currentPosition == PositionType.SHORT) {
-            // 空头持仓:检查MACD金叉信号
-            return isMacdGoldenCrossAndExpanding(macdResult);
-        }
-
-        return false;
-    }
-
-    /**
-     * 获取当前持仓状态
-     *
-     * @return 当前持仓状态
-     */
-    public PositionType getCurrentPosition() {
-        return currentPosition;
-    }
-
-    /**
-     * 获取开仓价格
-     *
-     * @return 开仓价格
-     */
-    public BigDecimal getEntryPrice() {
-        return entryPrice;
-    }
-
-    /**
-     * 获取开仓时间戳
-     *
-     * @return 开仓时间戳
-     */
-    public long getEntryTime() {
-        return entryTime;
-    }
-
-    /**
-     * 重置策略状态(清空持仓)
-     */
-    public void reset() {
-        this.currentPosition = PositionType.NONE;
-        this.entryPrice = BigDecimal.ZERO;
-        this.entryTime = 0;
-    }
-
-    /**
-     * 示例主方法,展示如何使用MACD和MA组合交易策略
-     *
-     * @param args 命令行参数(未使用)
-     */
-    public static void main(String[] args) {
-        // 创建策略实例(使用默认参数)
-        MacdMaStrategy strategy = new MacdMaStrategy();
-
-        // 示例:模拟历史价格数据(实际应用中应从数据源获取)
-        List<BigDecimal> historicalPrices = new ArrayList<>();
-
-        // 生成一些示例价格数据(这里仅作演示)
-        // 实际应用中应替换为真实的历史K线数据
-        for (int i = 0; i < 50; i++) {
-            // 模拟价格数据(示例中使用简单递增的价格)
-            historicalPrices.add(new BigDecimal("100.00").add(new BigDecimal(i * 0.5)));
-        }
-
-        // 模拟实时价格流处理
-        System.out.println("===== MACD和MA组合交易策略示例 =====");
-        System.out.println("开始处理价格数据并生成交易信号...");
-
-        // 模拟实时数据流(假设我们有更多的价格数据)
-        for (int i = 0; i < 20; i++) {
-            // 添加新的价格数据(这里仅作演示)
-            BigDecimal newPrice = new BigDecimal("125.00").add(new BigDecimal(i * 0.2));
-            historicalPrices.add(newPrice);
-
-            // 使用策略分析最新价格数据并生成交易指令
-            TradingOrder order = strategy.generateTradingOrder(historicalPrices);
-
-            // 输出交易信号和指令
-            System.out.printf("价格: %s, 当前持仓: %s, 交易指令: %s\n",
-                    newPrice.setScale(2, RoundingMode.HALF_UP),
-                    strategy.getCurrentPosition().name(),
-                    order != null ? order.toString() : "无交易指令");
-
-            // 示例:在实际应用中,你可能需要根据指令执行交易操作
-            if (order != null) {
-                if (order.getSide().equals("buy") && order.getPosSide().equals("long")) {
-                    System.out.println("[交易操作] 买入开多");
-                } else if (order.getSide().equals("sell") && order.getPosSide().equals("short")) {
-                    System.out.println("[交易操作] 卖出开空");
-                } else if (order.getSide().equals("sell") && order.getPosSide().equals("long")) {
-                    System.out.println("[交易操作] 卖出平多");
-                } else if (order.getSide().equals("buy") && order.getPosSide().equals("short")) {
-                    System.out.println("[交易操作] 买入平空");
-                }
-            }
-        }
-
-        // 打印策略最终状态
-        System.out.println("\n===== 策略最终状态 =====");
-        System.out.println("当前持仓: " + strategy.getCurrentPosition().name());
-        System.out.println("开仓价格: " + strategy.getEntryPrice());
-        System.out.println("开仓时间戳: " + strategy.getEntryTime());
-    }
 }
\ No newline at end of file

--
Gitblit v1.9.1