diff --git a/leopard-strategy/src/main/java/com/lanyuanxiaoyao/leopard/strategy/StrategyApplication.java b/leopard-strategy/src/main/java/com/lanyuanxiaoyao/leopard/strategy/StrategyApplication.java index 89acd34..6c5ac7b 100644 --- a/leopard-strategy/src/main/java/com/lanyuanxiaoyao/leopard/strategy/StrategyApplication.java +++ b/leopard-strategy/src/main/java/com/lanyuanxiaoyao/leopard/strategy/StrategyApplication.java @@ -101,12 +101,13 @@ public class StrategyApplication { .filter(daily -> daily.getTradeDate().isAfter(startDate) && daily.getTradeDate().isBefore(endDate)) .sorted(Comparator.comparing(Daily::getTradeDate)) .toList(); - var dailyXList = new ArrayList(); - var dailyYList = new ArrayList>(); + var oclhList = new HashMap<>(); var dailyCloseMapping = new HashMap(); for (var daily : dailies) { - dailyXList.add(daily.getTradeDate().toString()); - dailyYList.add(List.of(daily.getHfqOpen(), daily.getHfqClose(), daily.getHfqLow(), daily.getHfqHigh())); + oclhList.put( + daily.getTradeDate().toString(), + List.of(daily.getHfqOpen(), daily.getHfqClose(), daily.getHfqLow(), daily.getHfqHigh()) + ); dailyCloseMapping.put(daily.getTradeDate().toString(), daily.getHfqClose()); } charts.add( @@ -120,8 +121,7 @@ public class StrategyApplication { "日线", Dict.create() .set("type", "candle") - .set("xList", dailyXList) - .set("yList", dailyYList) + .set("oclh", oclhList) .set( "points", asset.getTrades() diff --git a/leopard-strategy/src/main/resources/templates/backtest_report.html b/leopard-strategy/src/main/resources/templates/backtest_report.html index 74b2715..54c44d5 100644 --- a/leopard-strategy/src/main/resources/templates/backtest_report.html +++ b/leopard-strategy/src/main/resources/templates/backtest_report.html @@ -22,6 +22,163 @@