fix: 不知道啥东西

需要用的时候现算就是了，避免维护更多的原始数据

.idea/compiler.xml

@@ -17,13 +17,11 @@
           <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.38/lombok-1.18.38.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/hibernate/orm/hibernate-jpamodelgen/6.6.8.Final/hibernate-jpamodelgen-6.6.8.Final.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/hibernate/orm/hibernate-core/6.6.8.Final/hibernate-core-6.6.8.Final.jar" />
-          <entry name="$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/3.2.0/jakarta.persistence-api-3.2.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/jakarta/transaction/jakarta.transaction-api/2.0.1/jakarta.transaction-api-2.0.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.5.0.Final/jboss-logging-3.5.0.Final.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/jakarta/inject/jakarta.inject-api/2.0.1/jakarta.inject-api-2.0.1.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/hibernate/common/hibernate-commons-annotations/7.0.3.Final/hibernate-commons-annotations-7.0.3.Final.jar" />
           <entry name="$MAVEN_REPOSITORY$/io/smallrye/jandex/3.2.0/jandex-3.2.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.15.11/byte-buddy-1.15.11.jar" />
           <entry name="$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0/jakarta.xml.bind-api-4.0.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/2.1.0/jakarta.activation-api-2.1.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/glassfish/jaxb/jaxb-runtime/4.0.2/jaxb-runtime-4.0.2.jar" />
@@ -31,10 +29,11 @@
           <entry name="$MAVEN_REPOSITORY$/org/eclipse/angus/angus-activation/2.0.0/angus-activation-2.0.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/glassfish/jaxb/txw2/4.0.2/txw2-4.0.2.jar" />
           <entry name="$MAVEN_REPOSITORY$/com/sun/istack/istack-commons-runtime/4.1.1/istack-commons-runtime-4.1.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/jakarta/inject/jakarta.inject-api/2.0.1/jakarta.inject-api-2.0.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.13.0/antlr4-runtime-4.13.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/3.0.2/jakarta.validation-api-3.0.2.jar" />
           <entry name="$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/2.1.1/jakarta.annotation-api-2.1.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.13.0/antlr4-runtime-4.13.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.15.11/byte-buddy-1.15.11.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.5.0.Final/jboss-logging-3.5.0.Final.jar" />
           <entry name="$MAVEN_REPOSITORY$/io/github/openfeign/querydsl/querydsl-apt/7.0/querydsl-apt-7.0-jpa.jar" />
           <entry name="$MAVEN_REPOSITORY$/io/github/openfeign/querydsl/querydsl-codegen/7.0/querydsl-codegen-7.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/io/github/openfeign/querydsl/querydsl-core/7.0/querydsl-core-7.0.jar" />
@@ -43,48 +42,7 @@
           <entry name="$MAVEN_REPOSITORY$/io/github/openfeign/querydsl/querydsl-codegen-utils/7.0/querydsl-codegen-utils-7.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/org/eclipse/jdt/ecj/3.40.0/ecj-3.40.0.jar" />
           <entry name="$MAVEN_REPOSITORY$/io/github/classgraph/classgraph/4.8.179/classgraph-4.8.179.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/26.0.2/annotations-26.0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/dev/morphia/morphia/morphia-core/2.5.0/morphia-core-2.5.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/config/smallrye-config/3.10.1/smallrye-config-3.10.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/config/smallrye-config-core/3.10.1/smallrye-config-core-3.10.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/eclipse/microprofile/config/microprofile-config-api/3.1/microprofile-config-api-3.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/common/smallrye-common-annotation/2.8.0/smallrye-common-annotation-2.8.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/common/smallrye-common-expression/2.8.0/smallrye-common-expression-2.8.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/common/smallrye-common-function/2.8.0/smallrye-common-function-2.8.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/common/smallrye-common-constraint/2.8.0/smallrye-common-constraint-2.8.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/common/smallrye-common-classloader/2.8.0/smallrye-common-classloader-2.8.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.8/asm-9.8.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/smallrye/config/smallrye-config-common/3.10.1/smallrye-config-common-3.10.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/5.4.0/mongodb-driver-sync-5.4.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/mongodb/bson/5.4.0/bson-5.4.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/5.4.0/mongodb-driver-core-5.4.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/mongodb/bson-record-codec/5.4.0/bson-record-codec-5.4.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-legacy/5.4.0/mongodb-driver-legacy-5.4.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/2.0.17/slf4j-api-2.0.17.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/github/spotbugs/spotbugs-annotations/4.8.6/spotbugs-annotations-4.8.6.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/semver4j/semver4j/5.6.0/semver4j-5.6.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.18.3/jsoup-1.18.3.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/hibernate/orm/hibernate-envers/7.0.0.Beta1/hibernate-envers-7.0.0.Beta1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/hibernate/models/hibernate-models/0.8.6/hibernate-models-0.8.6.jar" />
-          <entry name="$MAVEN_REPOSITORY$/io/github/openfeign/querydsl/querydsl-core/7.0/querydsl-core-7.0-tests.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/joda/joda-money/2.0.2/joda-money-2.0.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.13.1/junit-jupiter-5.13.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.13.1/junit-jupiter-api-5.13.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.13.1/junit-platform-commons-1.13.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.13.1/junit-jupiter-params-5.13.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.13.1/junit-jupiter-engine-5.13.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.13.1/junit-platform-engine-1.13.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.27.3/assertj-core-3.27.3.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.13.1/junit-vintage-engine-5.13.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/junit/junit/4.13.2/junit-4.13.2.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/easymock/easymock/5.6.0/easymock-5.6.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/objenesis/objenesis/3.4/objenesis-3.4.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/javassist/javassist/3.30.2-GA/javassist-3.30.2-GA.jar" />
+          <entry name="$MAVEN_REPOSITORY$/jakarta/persistence/jakarta.persistence-api/3.2.0/jakarta.persistence-api-3.2.0.jar" />
         </processorPath>
         <module name="leopard-core" />
       </profile>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,15 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="NullableProblems" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" value="true" />
+      <option name="REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_GETTER" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_SETTER_PARAMETER" value="true" />
+      <option name="REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS" value="true" />
+      <option name="REPORT_NULLS_PASSED_TO_NON_ANNOTATED_METHOD" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

leopard-core/pom.xml

@@ -20,10 +20,24 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-json</artifactId>
+    </dependency>
     <dependency>
       <groupId>cn.hutool</groupId>
       <artifactId>hutool-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>cn.hutool</groupId>
+      <artifactId>hutool-http</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.icepear.echarts</groupId>
+      <artifactId>echarts-java</artifactId>
+      <version>1.1.0</version>
+    </dependency>
 
     <dependency>
       <groupId>io.github.ralfkonrad.quantlib_for_maven</groupId>

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/Daily.java

@@ -1,5 +1,6 @@
 package com.lanyuanxiaoyao.leopard.core.entity;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.lanyuanxiaoyao.leopard.core.Constants;
 import com.lanyuanxiaoyao.service.template.entity.SimpleEntity;
 import jakarta.persistence.Column;
@@ -58,18 +59,18 @@ public class Daily extends SimpleEntity {
   private Stock stock;
 
   public Double getHfqOpen() {
-    return open * factor;
+    return open * ObjectUtil.defaultIfNull(factor, 1.0);
   }
 
   public Double getHfqClose() {
-    return close * factor;
+    return close * ObjectUtil.defaultIfNull(factor, 1.0);
   }
 
   public Double getHfqHigh() {
-    return high * factor;
+    return high * ObjectUtil.defaultIfNull(factor, 1.0);
   }
 
   public Double getHfqLow() {
-    return low * factor;
+    return low * ObjectUtil.defaultIfNull(factor, 1.0);
   }
 }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/Stock.java

@@ -61,10 +61,6 @@ public class Stock extends SimpleEntity {
   @ToString.Exclude
   private Set<Daily> dailies;
 
-  @OneToMany(mappedBy = "stock", cascade = CascadeType.REMOVE)
-  @ToString.Exclude
-  private Set<Yearly> yearlies;
-
   @OneToMany(mappedBy = "stock", cascade = CascadeType.REMOVE)
   @ToString.Exclude
   private Set<FinanceIndicator> indicators;

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/StockCollection.java

@@ -2,10 +2,11 @@ package com.lanyuanxiaoyao.leopard.core.entity;
 
 import com.lanyuanxiaoyao.leopard.core.Constants;
 import com.lanyuanxiaoyao.service.template.entity.SimpleEntity;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityListeners;
-import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import java.util.Set;
 import lombok.Getter;
@@ -31,7 +32,7 @@ public class StockCollection extends SimpleEntity {
   @Column(nullable = false)
   private String description;
 
-  @ManyToMany
+  @OneToMany(cascade = CascadeType.ALL)
   @ToString.Exclude
-  private Set<Stock> stocks;
+  private Set<StockScore> scores;
 }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/StockScore.java

@@ -0,0 +1,38 @@
+package com.lanyuanxiaoyao.leopard.core.entity;
+
+import com.lanyuanxiaoyao.leopard.core.Constants;
+import com.lanyuanxiaoyao.service.template.entity.SimpleEntity;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@Setter
+@Getter
+@ToString(callSuper = true)
+@FieldNameConstants
+@Entity
+@DynamicUpdate
+@DynamicInsert
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = Constants.DATABASE_PREFIX + "stock_score")
+public class StockScore extends SimpleEntity {
+  @ManyToOne
+  private Stock stock;
+  @ManyToOne
+  private StockCollection collection;
+  @ElementCollection
+  @JoinTable(name = Constants.DATABASE_PREFIX + "stock_score_extra")
+  private Map<String, String> extra;
+  private Double score;
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/Yearly.java

@@ -1,57 +0,0 @@
-package com.lanyuanxiaoyao.leopard.core.entity;
-
-import com.lanyuanxiaoyao.leopard.core.Constants;
-import com.lanyuanxiaoyao.service.template.entity.SimpleEntity;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-/**
- * 年线行情，后复权
- */
-@Setter
-@Getter
-@ToString(callSuper = true)
-@FieldNameConstants
-@Entity
-@DynamicUpdate
-@DynamicInsert
-@EntityListeners(AuditingEntityListener.class)
-@Table(name = Constants.DATABASE_PREFIX + "yearly")
-public class Yearly extends SimpleEntity {
-  @Column(name = "`year`", nullable = false)
-  @Comment("年份")
-  private Integer year;
-  @Comment("开盘价")
-  private Double open;
-  @Comment("最高价")
-  private Double high;
-  @Comment("最低价")
-  private Double low;
-  @Comment("收盘价")
-  private Double close;
-  @Comment("涨跌额")
-  private Double priceChangeAmount;
-  @Comment("涨跌幅")
-  private Double priceFluctuationRange;
-  @Comment("成交量")
-  private Double volume;
-  @Comment("成交额")
-  private Double turnover;
-
-  @ManyToOne
-  @JoinColumn(nullable = false)
-  @ToString.Exclude
-  private Stock stock;
-}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/dto/DailyDouble.java

@@ -0,0 +1,6 @@
+package com.lanyuanxiaoyao.leopard.core.entity.dto;
+
+import java.time.LocalDate;
+
+public record DailyDouble(LocalDate date, Double value) {
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/dto/Monthly.java

@@ -0,0 +1,18 @@
+package com.lanyuanxiaoyao.leopard.core.entity.dto;
+
+import java.time.LocalDate;
+
+public record Monthly(
+  LocalDate tradeDate,
+  int year,
+  int month,
+  Double open,
+  Double high,
+  Double low,
+  Double close,
+  Double priceChangeAmount,
+  Double priceFluctuationRange,
+  Double volume,
+  Double turnover
+) {
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/dto/Weekly.java

@@ -0,0 +1,18 @@
+package com.lanyuanxiaoyao.leopard.core.entity.dto;
+
+import java.time.LocalDate;
+
+public record Weekly(
+  LocalDate tradeDate,
+  int year,
+  int week,
+  Double open,
+  Double high,
+  Double low,
+  Double close,
+  Double priceChangeAmount,
+  Double priceFluctuationRange,
+  Double volume,
+  Double turnover
+) {
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/dto/YearAndMonth.java

@@ -0,0 +1,4 @@
+package com.lanyuanxiaoyao.leopard.core.entity.dto;
+
+public record YearAndMonth(int year, int month) {
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/dto/YearAndWeek.java

@@ -0,0 +1,4 @@
+package com.lanyuanxiaoyao.leopard.core.entity.dto;
+
+public record YearAndWeek(int year, int week) {
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/dto/Yearly.java

@@ -0,0 +1,17 @@
+package com.lanyuanxiaoyao.leopard.core.entity.dto;
+
+import java.time.LocalDate;
+
+public record Yearly(
+  LocalDate tradeDate,
+  int year,
+  Double open,
+  Double high,
+  Double low,
+  Double close,
+  Double priceChangeAmount,
+  Double priceFluctuationRange,
+  Double volume,
+  Double turnover
+) {
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/helper/NumberHelper.java

@@ -1,4 +1,4 @@
-package com.lanyuanxiaoyao.leopard.server.helper;
+package com.lanyuanxiaoyao.leopard.core.helper;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -42,6 +42,20 @@ public class NumberHelper {
     return NumberUtil.decimalFormat("0.00%", value);
   }
 
+  public static String formatPriceDouble(Double value) {
+    if (ObjectUtil.isNull(value)) {
+      return null;
+    }
+    return NumberUtil.decimalFormat("0.00", value);
+  }
+
+  public static String formatPriceDouble(Integer value) {
+    if (ObjectUtil.isNull(value)) {
+      return null;
+    }
+    return NumberUtil.decimalFormat("0.00", value);
+  }
+
   public static Double parseDouble(String value) {
     if (StrUtil.isBlank(value)) {
       return null;

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/helper/TaHelper.java

@@ -0,0 +1,65 @@
+package com.lanyuanxiaoyao.leopard.core.helper;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.lanyuanxiaoyao.leopard.core.entity.Daily;
+import java.time.Duration;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+import org.ta4j.core.Bar;
+import org.ta4j.core.BaseBar;
+import org.ta4j.core.BaseBarSeries;
+import org.ta4j.core.indicators.SMAIndicator;
+import org.ta4j.core.indicators.helpers.ClosePriceIndicator;
+
+public class TaHelper {
+  public static <T> List<Double> sma(List<T> data, int period, Function<T, Double> closeFunction) {
+    var series = new BaseBarSeries();
+    for (int i = 0; i < data.size(); i++) {
+      var price = closeFunction.apply(data.get(i));
+      Bar bar = new BaseBar(
+        Duration.ofDays(1),
+        ZonedDateTime.now().plusDays(i),
+        price,
+        price,
+        price,
+        price,
+        0
+      );
+      series.addBar(bar);
+    }
+    var sma = new SMAIndicator(new ClosePriceIndicator(series), period);
+    var result = new ArrayList<Double>(series.getBarCount());
+    for (int i = 0; i < series.getBarCount(); i++) {
+      result.add(sma.getValue(i).doubleValue());
+    }
+    return result;
+  }
+
+  public static Double maxFromDaily(List<Daily> dailies, Function<Daily, Double> function) {
+    return dailies.stream()
+      .map(function)
+      .filter(ObjectUtil::isNotNull)
+      .mapToDouble(Double::doubleValue)
+      .max()
+      .orElse(0);
+  }
+
+  public static Double minFromDaily(List<Daily> dailies, Function<Daily, Double> function) {
+    return dailies.stream()
+      .map(function)
+      .filter(ObjectUtil::isNotNull)
+      .mapToDouble(Double::doubleValue)
+      .min()
+      .orElse(0);
+  }
+
+  public static Double sumFromDaily(List<Daily> dailies, Function<Daily, Double> function) {
+    return dailies.stream()
+      .map(function)
+      .filter(ObjectUtil::isNotNull)
+      .mapToDouble(Double::doubleValue)
+      .sum();
+  }
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/repository/DailyRepository.java

@@ -2,11 +2,12 @@ package com.lanyuanxiaoyao.leopard.core.repository;
 
 import com.lanyuanxiaoyao.leopard.core.entity.Daily;
 import com.lanyuanxiaoyao.service.template.repository.SimpleRepository;
+import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Predicate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
-import org.springframework.data.domain.Sort;
+import java.util.Set;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -14,10 +15,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface DailyRepository extends SimpleRepository<Daily> {
   @Query("select distinct daily.tradeDate from Daily daily")
-  List<LocalDate> findDistinctTradeDate();
-
-  @Query("select distinct daily.tradeDate from Daily daily where daily.stock.id = ?1")
-  List<LocalDate> findDistinctTradeDateByStockId(Long stockId);
+  Set<LocalDate> findDistinctTradeDate();
 
   @Query("select max(daily.tradeDate) from Daily daily")
   LocalDate findMaxTradeDate();
@@ -25,11 +23,18 @@ public interface DailyRepository extends SimpleRepository<Daily> {
   @Query("select min(daily.tradeDate) from Daily daily")
   LocalDate findMinTradeDate();
 
+  @Query("from Daily daily where daily.stock.id = ?1 order by daily.tradeDate desc limit 1")
+  Optional<Daily> findLatest(Long stockId);
+
   @EntityGraph(attributePaths = {"stock"})
   @Override
   Optional<Daily> findOne(Predicate predicate);
 
   @EntityGraph(attributePaths = {"stock"})
   @Override
-  List<Daily> findAll(Predicate predicate, Sort sort);
+  List<Daily> findAll(Predicate predicate, OrderSpecifier<?>... orders);
+
+  @EntityGraph(attributePaths = {"stock"})
+  @Query("from Daily daily where daily.stock.id = ?1 and daily.tradeDate <= current date order by daily.tradeDate desc limit ?2")
+  List<Daily> findRecent(Long stockId, int days);
 }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/repository/StockRepository.java

@@ -4,8 +4,7 @@ import com.lanyuanxiaoyao.leopard.core.entity.Stock;
 import com.lanyuanxiaoyao.service.template.repository.SimpleRepository;
 import jakarta.transaction.Transactional;
 import java.util.Collection;
-import java.util.List;
-import org.springframework.data.jpa.repository.EntityGraph;
+import java.util.Set;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -17,16 +16,12 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface StockRepository extends SimpleRepository<Stock> {
   @Query("select distinct stock.industry from Stock stock where stock.industry is not null")
-  List<String> findDistinctIndustries();
+  Set<String> findDistinctIndustries();
 
   @Query("select distinct stock.code from Stock stock")
-  List<String> findDistinctCodes();
+  Set<String> findDistinctCodes();
 
-  @Modifying
   @Transactional(rollbackOn = Throwable.class)
+  @Modifying
   void deleteAllByCodeIn(Collection<String> code);
-
-  @EntityGraph(attributePaths = {"indicators"})
-  @Query("from Stock stock where size(stock.indicators) >= ?1")
-  List<Stock> findAllByIndicatorsSizeGreaterThanEqual(int count);
 }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/repository/TaskRepository.java

@@ -14,7 +14,11 @@ import org.springframework.transaction.annotation.Transactional;
 @Repository
 public interface TaskRepository extends SimpleRepository<Task> {
   @Modifying
-  @Query("update Task task set task.status = com.lanyuanxiaoyao.leopard.core.entity.Task.Status.FAILURE where task.status = com.lanyuanxiaoyao.leopard.core.entity.Task.Status.RUNNING")
+  @Query("""
+    update Task task set
+      task.status = com.lanyuanxiaoyao.leopard.core.entity.Task.Status.FAILURE,
+      task.finishedTime = current timestamp
+    where task.status = com.lanyuanxiaoyao.leopard.core.entity.Task.Status.RUNNING""")
   void updateAllRunningTaskToFailure();
 
   @Transactional(rollbackFor = Throwable.class)

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/repository/YearlyRepository.java

@@ -1,9 +0,0 @@
-package com.lanyuanxiaoyao.leopard.core.repository;
-
-import com.lanyuanxiaoyao.leopard.core.entity.Yearly;
-import com.lanyuanxiaoyao.service.template.repository.SimpleRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface YearlyRepository extends SimpleRepository<Yearly> {
-}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/AssessmentService.java

@@ -32,11 +32,7 @@ public class AssessmentService {
 
   public Set<Result> assess(Set<Stock> stocks, int year) {
     if (ObjectUtil.isNotEmpty(stocks)) {
-      var industries = stocks
-        .stream()
-        .map(Stock::getIndustry)
-        .collect(Collectors.toSet());
-      var topChange = industryService.topChange(year, industries, stocks);
+      var topChange = industryService.topChange(year, stocks);
       var dailyMap = dailyRepository.findAll(
           QDaily.daily.tradeDate.year().eq(year)
             .and(QDaily.daily.stock.in(stocks))

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/IndustryService.java

@@ -1,5 +1,6 @@
 package com.lanyuanxiaoyao.leopard.core.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.lanyuanxiaoyao.leopard.core.entity.Daily;
 import com.lanyuanxiaoyao.leopard.core.entity.QDaily;
 import com.lanyuanxiaoyao.leopard.core.entity.Stock;
@@ -31,29 +32,24 @@ public class IndustryService {
   }
 
   public Map<IndustryYearlyKey, Double> topChange(int year) {
-    return topChange(year, null, null);
+    return topChange(year, null);
   }
 
-  public Map<IndustryYearlyKey, Double> topChange(int year, Set<String> includeIndustries) {
-    return topChange(year, includeIndustries, null);
-  }
-
-  public Map<IndustryYearlyKey, Double> topChange(int year, Set<String> includeIndustries, Set<Stock> includeStocks) {
-    return topChange(year, year, includeIndustries, includeStocks);
+  public Map<IndustryYearlyKey, Double> topChange(int year, Set<Stock> includeStocks) {
+    return topChange(year, year, includeStocks);
   }
 
   public Map<IndustryYearlyKey, Double> topChange(int startYear, int endYear) {
-    return topChange(startYear, endYear, null, null);
+    return topChange(startYear, endYear, null);
   }
 
-  public Map<IndustryYearlyKey, Double> topChange(int startYear, int endYear, Set<String> includeIndustries) {
-    return topChange(startYear, endYear, includeIndustries, null);
-  }
-
-  public Map<IndustryYearlyKey, Double> topChange(int startYear, int endYear, Set<String> includeIndustries, Set<Stock> includeStocks) {
+  public Map<IndustryYearlyKey, Double> topChange(int startYear, int endYear, Set<Stock> includeStocks) {
+    var includeIndustries = ObjectUtil.isNull(includeStocks)
+      ? null
+      : includeStocks.stream().map(Stock::getIndustry).collect(Collectors.toSet());
     return stockRepository.findDistinctIndustries()
       .parallelStream()
-      .filter(industry -> includeIndustries == null || includeIndustries.contains(industry))
+      .filter(o -> ObjectUtil.isNull(includeIndustries) || includeIndustries.contains(o))
       .flatMap(industry -> {
         var keys = new ArrayList<IndustryYearlyKey>();
         for (int year = startYear; year <= endYear; year++) {
@@ -62,7 +58,6 @@ public class IndustryService {
         return keys.stream();
       })
       .map(key -> {
-        log.info("计算行业 {} {} 年度涨跌幅", key.industry(), key.year());
         var maxChange = dailyRepository
           .findAll(
             QDaily.daily.stock.industry.eq(key.industry())
@@ -90,4 +85,14 @@ public class IndustryService {
 
   public record IndustryYearlyKey(String industry, int year) {
   }
+
+  public record IndustryYearlyData(
+    String industry,
+    int year,
+    double maxChange,
+    double minChange,
+    double avgChange,
+    double medianChange
+  ) {
+  }
 }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockCollectionService.java

@@ -1,4 +1,4 @@
-package com.lanyuanxiaoyao.leopard.server.service;
+package com.lanyuanxiaoyao.leopard.core.service;
 
 import com.lanyuanxiaoyao.leopard.core.entity.StockCollection;
 import com.lanyuanxiaoyao.leopard.core.repository.StockCollectionRepository;

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/StockService.java

@@ -0,0 +1,216 @@
+package com.lanyuanxiaoyao.leopard.core.service;
+
+import com.lanyuanxiaoyao.leopard.core.entity.Daily;
+import com.lanyuanxiaoyao.leopard.core.entity.FinanceIndicator;
+import com.lanyuanxiaoyao.leopard.core.entity.QDaily;
+import com.lanyuanxiaoyao.leopard.core.entity.QFinanceIndicator;
+import com.lanyuanxiaoyao.leopard.core.entity.Stock;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.Monthly;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.Weekly;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.YearAndMonth;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.YearAndWeek;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.Yearly;
+import com.lanyuanxiaoyao.leopard.core.repository.DailyRepository;
+import com.lanyuanxiaoyao.leopard.core.repository.FinanceIndicatorRepository;
+import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
+import com.lanyuanxiaoyao.service.template.service.SimpleServiceSupport;
+import java.time.LocalDate;
+import java.time.temporal.ChronoField;
+import java.time.temporal.WeekFields;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import static com.lanyuanxiaoyao.leopard.core.helper.TaHelper.maxFromDaily;
+import static com.lanyuanxiaoyao.leopard.core.helper.TaHelper.minFromDaily;
+import static com.lanyuanxiaoyao.leopard.core.helper.TaHelper.sumFromDaily;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250828
+ */
+@Slf4j
+@Service
+public class StockService extends SimpleServiceSupport<Stock> {
+  private final FinanceIndicatorRepository financeIndicatorRepository;
+  private final DailyRepository dailyRepository;
+
+  public StockService(StockRepository repository, FinanceIndicatorRepository financeIndicatorRepository, DailyRepository dailyRepository) {
+    super(repository);
+    this.financeIndicatorRepository = financeIndicatorRepository;
+    this.dailyRepository = dailyRepository;
+  }
+
+  @Cacheable(value = "findFinanceIndicator", cacheManager = "long-cache", sync = true)
+  public Optional<FinanceIndicator> findFinanceIndicator(Long stockId, Integer year) {
+    return financeIndicatorRepository.findOne(
+      QFinanceIndicator.financeIndicator.year.eq(year)
+        .and(QFinanceIndicator.financeIndicator.stock.id.eq(stockId))
+    );
+  }
+
+  @Cacheable(value = "findFinanceIndicatorRecent", cacheManager = "long-cache", sync = true)
+  public List<FinanceIndicator> findFinanceIndicatorRecent(Long stockId, int years) {
+    var current = LocalDate.now();
+    return financeIndicatorRepository.findAll(
+      QFinanceIndicator.financeIndicator.stock.id.eq(stockId)
+        .and(QFinanceIndicator.financeIndicator.year.between(current.minusYears(years).getYear(), current.getYear())),
+      QFinanceIndicator.financeIndicator.year.asc()
+    );
+  }
+
+  @Cacheable(value = "findDailyRecent", cacheManager = "long-cache", sync = true)
+  public List<Daily> findDailyRecent(Long stockId, int days) {
+    return dailyRepository.findRecent(stockId, days)
+      .stream()
+      .sorted(Comparator.comparing(Daily::getTradeDate))
+      .toList();
+  }
+
+  @Cacheable(value = "findDailyLatest", cacheManager = "long-cache", sync = true)
+  public Optional<Daily> findDailyLatest(Long stockId) {
+    return dailyRepository.findLatest(stockId);
+  }
+
+  @Cacheable(value = "findYearlyRecent", cacheManager = "long-cache", sync = true)
+  public List<Yearly> findYearlyRecent(Long stockId, int years) {
+    var current = LocalDate.now().withMonth(1).withDayOfMonth(1);
+    var start = current.minusYears(years).getYear();
+    var end = current.getYear();
+    return dailyRepository
+      .findAll(
+        QDaily.daily.stock.id.eq(stockId)
+          .and(QDaily.daily.tradeDate.year().gt(start))
+          .and(QDaily.daily.tradeDate.year().loe(end)),
+        QDaily.daily.tradeDate.asc()
+      )
+      .stream()
+      .collect(Collectors.groupingBy(daily -> daily.getTradeDate().getYear()))
+      .entrySet()
+      .stream()
+      .map(entry -> {
+        var year = entry.getKey();
+        var dailies = entry.getValue();
+        var open = dailies.getFirst().getHfqOpen();
+        var close = dailies.getLast().getHfqClose();
+        return new Yearly(
+          LocalDate.of(year, 1, 1),
+          year,
+          open,
+          maxFromDaily(dailies, Daily::getHfqHigh),
+          minFromDaily(dailies, Daily::getHfqLow),
+          close,
+          close - open,
+          (close - open) / open * 100,
+          sumFromDaily(dailies, Daily::getVolume),
+          sumFromDaily(dailies, Daily::getTurnover)
+        );
+      })
+      .sorted(Comparator.comparingInt(Yearly::year))
+      .toList();
+  }
+
+  @Cacheable(value = "findMonthlyRecent", cacheManager = "long-cache", sync = true)
+  public List<Monthly> findMonthlyRecent(Long stockId, int months) {
+    var end = LocalDate.now().withDayOfMonth(1);
+    var start = end.minusMonths(months);
+    return dailyRepository
+      .findAll(
+        QDaily.daily.stock.id.eq(stockId)
+          .and(
+            QDaily.daily.tradeDate.year().gt(start.getYear())
+              .or(
+                QDaily.daily.tradeDate.year().eq(start.getYear())
+                  .and(QDaily.daily.tradeDate.month().gt(start.getMonthValue()))
+              )
+          )
+          .and(
+            QDaily.daily.tradeDate.year().lt(end.getYear())
+              .or(
+                QDaily.daily.tradeDate.year().eq(end.getYear())
+                  .and(QDaily.daily.tradeDate.month().loe(end.getMonthValue()))
+              )
+          ),
+        QDaily.daily.tradeDate.asc()
+      )
+      .stream()
+      .collect(Collectors.groupingBy(daily -> new YearAndMonth(daily.getTradeDate().getYear(), daily.getTradeDate().getMonthValue())))
+      .entrySet()
+      .stream()
+      .map(entry -> {
+        var yearAndMonth = entry.getKey();
+        var dailies = entry.getValue();
+        var open = dailies.getFirst().getHfqOpen();
+        var close = dailies.getLast().getHfqClose();
+        return new Monthly(
+          LocalDate.of(yearAndMonth.year(), yearAndMonth.month(), 1),
+          yearAndMonth.year(),
+          yearAndMonth.month(),
+          open,
+          maxFromDaily(dailies, Daily::getHfqHigh),
+          minFromDaily(dailies, Daily::getHfqLow),
+          close,
+          close - open,
+          (close - open) / open * 100,
+          sumFromDaily(dailies, Daily::getVolume),
+          sumFromDaily(dailies, Daily::getTurnover)
+        );
+      })
+      .sorted(Comparator.comparingInt(monthly -> monthly.year() * 100 + monthly.month()))
+      .toList();
+  }
+
+  @Cacheable(value = "findWeeklyRecent", cacheManager = "long-cache", sync = true)
+  public List<Weekly> findWeeklyRecent(Long stockId, int weeks) {
+    var end = LocalDate.now().with(ChronoField.DAY_OF_WEEK, 1);
+    var start = end.minusWeeks(weeks);
+    return dailyRepository
+      .findAll(
+        QDaily.daily.stock.id.eq(stockId)
+          .and(
+            QDaily.daily.tradeDate.year().gt(start.getYear())
+              .or(
+                QDaily.daily.tradeDate.year().eq(start.getYear())
+                  .and(QDaily.daily.tradeDate.week().gt(start.get(WeekFields.ISO.weekOfYear())))
+              )
+          )
+          .and(
+            QDaily.daily.tradeDate.year().lt(end.getYear())
+              .or(
+                QDaily.daily.tradeDate.year().eq(end.getYear())
+                  .and(QDaily.daily.tradeDate.month().loe(end.get(WeekFields.ISO.weekOfYear())))
+              )
+          ),
+        QDaily.daily.tradeDate.asc()
+      )
+      .stream()
+      .collect(Collectors.groupingBy(daily -> new YearAndWeek(daily.getTradeDate().getYear(), daily.getTradeDate().get(WeekFields.ISO.weekOfYear()))))
+      .entrySet()
+      .stream()
+      .map(entry -> {
+        var yearAndWeek = entry.getKey();
+        var dailies = entry.getValue();
+        var open = dailies.getFirst().getHfqOpen();
+        var close = dailies.getLast().getHfqClose();
+        return new Weekly(
+          LocalDate.of(yearAndWeek.year(), 1, 1).with(WeekFields.ISO.weekOfYear(), yearAndWeek.week()),
+          yearAndWeek.year(),
+          yearAndWeek.week(),
+          open,
+          maxFromDaily(dailies, Daily::getHfqHigh),
+          minFromDaily(dailies, Daily::getHfqLow),
+          close,
+          close - open,
+          (close - open) / open * 100,
+          sumFromDaily(dailies, Daily::getVolume),
+          sumFromDaily(dailies, Daily::getTurnover)
+        );
+      })
+      .sorted(Comparator.comparingInt(weekly -> weekly.year() * 100 + weekly.week()))
+      .toList();
+  }
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TaskService.java

@@ -1,16 +1,15 @@
-package com.lanyuanxiaoyao.leopard.server.service;
+package com.lanyuanxiaoyao.leopard.core.service;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.lanyuanxiaoyao.leopard.core.entity.Task;
 import com.lanyuanxiaoyao.leopard.core.repository.TaskRepository;
-import com.lanyuanxiaoyao.leopard.server.service.task.TaskRunner;
-import com.lanyuanxiaoyao.leopard.server.service.task.UpdateDailyTask;
-import com.lanyuanxiaoyao.leopard.server.service.task.UpdateFinanceIndicatorTask;
-import com.lanyuanxiaoyao.leopard.server.service.task.UpdateStockTask;
-import com.lanyuanxiaoyao.leopard.server.service.task.UpdateYearlyTask;
+import com.lanyuanxiaoyao.leopard.core.task.PyramidSelect;
+import com.lanyuanxiaoyao.leopard.core.task.TaskRunner;
+import com.lanyuanxiaoyao.leopard.core.task.UpdateDailyTask;
+import com.lanyuanxiaoyao.leopard.core.task.UpdateFinanceIndicatorTask;
+import com.lanyuanxiaoyao.leopard.core.task.UpdateStockTask;
 import com.lanyuanxiaoyao.service.template.service.SimpleServiceSupport;
-import jakarta.transaction.Transactional;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
@@ -19,9 +18,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 
 /**
@@ -32,32 +29,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaskService extends SimpleServiceSupport<Task> {
   private final ExecutorService executor = Executors.newFixedThreadPool(50);
-  private final TaskRepository taskRepository;
   private final ApplicationContext context;
 
   @Getter
   private final Set<TaskTemplate> templates = Stream.of(
-    new TaskTemplate("更新股票信息", "更新股票信息", UpdateStockTask.class),
-    new TaskTemplate("更新年线指标", "更新年线指标", UpdateYearlyTask.class),
-    new TaskTemplate("更新日线数据", "更新日线数据", UpdateDailyTask.class),
-    new TaskTemplate("更新财务指标", "更新财务指标", UpdateFinanceIndicatorTask.class)
+    new TaskTemplate("b29f76a5-b07d-4182-85f8-2641c2a975c1", "更新股票信息", "更新股票信息", UpdateStockTask.class),
+    new TaskTemplate("b9df25ce-aa55-4f73-8265-d8a724614177", "更新日线数据", "更新日线数据", UpdateDailyTask.class),
+    new TaskTemplate("8ab30478-c81f-4bbf-94dd-7e05fa537b50", "更新财务指标", "更新财务指标", UpdateFinanceIndicatorTask.class),
+    new TaskTemplate("a6a7b569-a171-481b-9184-716925571639", "金字塔选股", "金字塔选股", PyramidSelect.class)
   ).collect(Collectors.toSet());
   private final Map<String, TaskTemplate> templateMap = templates.stream()
     .collect(Collectors.toMap(TaskTemplate::id, template -> template));
 
   public TaskService(TaskRepository repository, ApplicationContext context) {
     super(repository);
-    this.taskRepository = repository;
     this.context = context;
   }
 
-  @Transactional(rollbackOn = Throwable.class)
-  @EventListener(ApplicationReadyEvent.class)
-  public void onApplicationReady() {
-    log.warn("更新所有未完成的任务状态为失败");
-    taskRepository.updateAllRunningTaskToFailure();
-  }
-
   public TaskTemplate getTemplate(String templateId) {
     return templateMap.get(templateId);
   }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/TuShareService.java

@@ -1,4 +1,4 @@
-package com.lanyuanxiaoyao.leopard.server.service;
+package com.lanyuanxiaoyao.leopard.core.service;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
@@ -97,9 +97,19 @@ public class TuShareService {
 
   @SneakyThrows
   public TuShareResponse factorList(LocalDate tradeDate) {
+    return factorList(tradeDate, null);
+  }
+
+  @SneakyThrows
+  public TuShareResponse factorList(LocalDate tradeDate, String stockCode) {
+    var paramsMap = new HashMap<String, Object>();
+    paramsMap.put("trade_date", tradeDate.format(TRADE_FORMAT));
+    if (StrUtil.isNotBlank(stockCode)) {
+      paramsMap.put("ts_code", stockCode);
+    }
     var response = HttpUtil.post(API_URL, buildRequest(
       "adj_factor",
-      Map.of("trade_date", tradeDate.format(TRADE_FORMAT)),
+      paramsMap,
       List.of("ts_code", "trade_date", "adj_factor")
     ));
     var tuShareResponse = mapper.readValue(response, TuShareResponse.class);

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/selector/PyramidStockSelector.java

@@ -4,14 +4,17 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.lanyuanxiaoyao.leopard.core.entity.FinanceIndicator;
 import com.lanyuanxiaoyao.leopard.core.entity.QStock;
-import com.lanyuanxiaoyao.leopard.core.entity.Stock;
+import com.lanyuanxiaoyao.leopard.core.helper.NumberHelper;
 import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
 import java.time.LocalDate;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 金字塔选股
@@ -28,190 +31,207 @@ public class PyramidStockSelector implements StockSelector<PyramidStockSelector.
     this.stockRepository = stockRepository;
   }
 
+  @Transactional(readOnly = true)
   @Override
   public Set<Candidate> select(Request request) {
     // 选择至少有最近5年财报的股票
     // 有点奇怪，001400.SZ有近5年的财报但资料显示是2025年才上市的
-    var stocks = stockRepository.findAll(QStock.stock.listedDate.before(LocalDate.of(request.year(), 1, 1)));
-    log.info("Year: {} Stock: {}", request.year(), stocks.size());
-    var scores = stocks.stream().collect(Collectors.toMap(stock -> stock, code -> 0));
-    for (Stock stock : stocks) {
-      var recentIndicators = stock.getIndicators()
-        .stream()
-        .filter(indicator -> indicator.getYear() < request.year())
-        .sorted((a, b) -> b.getYear() - a.getYear())
-        .limit(5)
-        .toList();
-      if (recentIndicators.size() < 5) {
-        continue;
-      }
-      var latestIndicator = recentIndicators.getFirst();
-
-      var roeScore = 0;
-      if (recentIndicators.stream().noneMatch(indicator -> indicator.getReturnOnEquity() == null || indicator.getReturnOnEquity() < 0)) {
-        var averageRoe = recentIndicators.stream()
-          .map(FinanceIndicator::getReturnOnEquity)
-          .map(item -> ObjectUtil.defaultIfNull(item, 0.0))
-          .mapToDouble(Double::doubleValue)
-          .average()
-          .orElse(0.0);
-        if (averageRoe >= 35) {
-          roeScore = 550;
-        } else if (averageRoe >= 30) {
-          roeScore = 500;
-        } else if (averageRoe >= 25) {
-          roeScore = 450;
-        } else if (averageRoe >= 20) {
-          roeScore = 400;
-        } else if (averageRoe >= 15) {
-          roeScore = 350;
-        } else if (averageRoe >= 10) {
-          roeScore = 300;
-        }
-      }
-      scores.put(stock, scores.get(stock) + roeScore);
-
-      var roaScore = 0;
-      if (recentIndicators.stream().noneMatch(indicator -> indicator.getReturnOnAssets() == null)) {
-        var averageRoa = recentIndicators.stream()
-          .map(FinanceIndicator::getReturnOnAssets)
-          .mapToDouble(Double::doubleValue)
-          .average()
-          .orElse(0.0);
-        if (averageRoa >= 15) {
-          roaScore = 100;
-        } else if (averageRoa >= 11) {
-          roaScore = 80;
-        } else if (averageRoa >= 7) {
-          roaScore = 50;
-        }
-      }
-      scores.put(stock, scores.get(stock) + roaScore);
-
-      var netProfitScore = 0;
-      if (recentIndicators.stream().noneMatch(indicator -> indicator.getNetProfit() == null)) {
-        var averageNetProfit = recentIndicators.stream()
-          .map(FinanceIndicator::getNetProfit)
-          .mapToDouble(Double::doubleValue)
-          .average()
-          .orElse(0.0);
-        if (averageNetProfit >= 10000.0 * 10000000) {
-          netProfitScore = 150;
-        } else if (averageNetProfit >= 1000.0 * 10000000) {
-          netProfitScore = 100;
-        }
-      }
-      scores.put(stock, scores.get(stock) + netProfitScore);
-
-      var cashScore = 0;
-      if (
-        ArrayUtil.isAllNotNull(latestIndicator.getTotalAssetsTurnover(), latestIndicator.getCashAndCashEquivalentsToTotalAssetsRatio())
-          && (
-          latestIndicator.getTotalAssetsTurnover() > 0.8 && latestIndicator.getCashAndCashEquivalentsToTotalAssetsRatio() >= 0.1
-            || latestIndicator.getTotalAssetsTurnover() <= 0.8 && latestIndicator.getCashAndCashEquivalentsToTotalAssetsRatio() >= 0.2
-        )
-      ) {
-        cashScore = 50;
-      }
-      scores.put(stock, scores.get(stock) + cashScore);
-
-      if (ObjectUtil.isNotNull(latestIndicator.getDaysAccountsReceivableTurnover()) && latestIndicator.getDaysAccountsReceivableTurnover() <= 30) {
-        scores.put(stock, scores.get(stock) + 20);
-      }
-      if (ObjectUtil.isNotNull(latestIndicator.getDaysInventoryTurnover()) && latestIndicator.getDaysInventoryTurnover() <= 30) {
-        scores.put(stock, scores.get(stock) + 20);
-      }
-      if (ArrayUtil.isAllNotNull(latestIndicator.getDaysAccountsReceivableTurnover(), latestIndicator.getDaysInventoryTurnover())) {
-        if (latestIndicator.getDaysAccountsReceivableTurnover() + latestIndicator.getDaysInventoryTurnover() <= 40) {
-          scores.put(stock, scores.get(stock) + 20);
-        } else if (latestIndicator.getDaysAccountsReceivableTurnover() + latestIndicator.getDaysInventoryTurnover() <= 60) {
-          scores.put(stock, scores.get(stock) + 10);
-        }
-      }
-
-      if (recentIndicators.stream().noneMatch(indicator -> indicator.getOperatingGrossProfitMargin() == null)) {
-        var stat = new DescriptiveStatistics();
-        recentIndicators.stream()
-          .map(FinanceIndicator::getOperatingGrossProfitMargin)
-          .mapToDouble(Double::doubleValue)
-          .forEach(stat::addValue);
-        if (stat.getStandardDeviation() <= 0.3) {
-          scores.put(stock, scores.get(stock) + 50);
-        }
-      }
-
-      var operatingSafeMarginScore = 0;
-      if (ObjectUtil.isNotNull(latestIndicator.getOperatingSafetyMarginRatio())) {
-        if (latestIndicator.getOperatingSafetyMarginRatio() >= 70) {
-          operatingSafeMarginScore = 50;
-        } else if (latestIndicator.getOperatingSafetyMarginRatio() >= 50) {
-          operatingSafeMarginScore = 30;
-        } else if (latestIndicator.getOperatingSafetyMarginRatio() >= 30) {
-          operatingSafeMarginScore = 10;
-        }
-      }
-      scores.put(stock, scores.get(stock) + operatingSafeMarginScore);
-
-      var netProfitAscendingScore = 0;
-      if (recentIndicators.stream().noneMatch(indicator -> indicator.getNetProfit() == null)) {
-        if (recentIndicators.get(0).getNetProfit() > recentIndicators.get(1).getNetProfit()) {
-          netProfitAscendingScore += 30;
-        } else {
-          netProfitAscendingScore -= 30;
-        }
-        if (recentIndicators.get(1).getNetProfit() > recentIndicators.get(2).getNetProfit()) {
-          netProfitAscendingScore += 25;
-        } else {
-          netProfitAscendingScore -= 25;
-        }
-
-        if (recentIndicators.get(2).getNetProfit() > recentIndicators.get(3).getNetProfit()) {
-          netProfitAscendingScore += 20;
-        } else {
-          netProfitAscendingScore -= 20;
-        }
-
-        if (recentIndicators.get(3).getNetProfit() > recentIndicators.get(4).getNetProfit()) {
-          netProfitAscendingScore += 15;
-        } else {
-          netProfitAscendingScore -= 15;
-        }
-      }
-      scores.put(stock, scores.get(stock) + netProfitAscendingScore);
-
-      var cashAscendingScore = 0;
-      if (recentIndicators.stream().noneMatch(indicator -> indicator.getCashAndCashEquivalents() == null)) {
-        if (recentIndicators.get(0).getCashAndCashEquivalents() > recentIndicators.get(1).getCashAndCashEquivalents()) {
-          cashAscendingScore += 30;
-        } else {
-          cashAscendingScore -= 30;
-        }
-
-        if (recentIndicators.get(1).getCashAndCashEquivalents() > recentIndicators.get(2).getCashAndCashEquivalents()) {
-          cashAscendingScore += 25;
-        } else {
-          cashAscendingScore -= 25;
-        }
-
-        if (recentIndicators.get(2).getCashAndCashEquivalents() > recentIndicators.get(3).getCashAndCashEquivalents()) {
-          cashAscendingScore += 20;
-        } else {
-          cashAscendingScore -= 20;
-        }
-
-        if (recentIndicators.get(3).getCashAndCashEquivalents() > recentIndicators.get(4).getCashAndCashEquivalents()) {
-          cashAscendingScore += 15;
-        } else {
-          cashAscendingScore -= 15;
-        }
-      }
-      scores.put(stock, scores.get(stock) + cashAscendingScore);
-    }
-    return scores.entrySet()
+    return stockRepository.findAll(QStock.stock.listedDate.before(LocalDate.of(request.year(), 1, 1)))
       .stream()
-      .sorted((e1, e2) -> e2.getValue() - e1.getValue())
-      .limit(request.limit())
-      .map(entry -> new Candidate(entry.getKey(), entry.getValue()))
+      .map(stock -> {
+        var extra = new HashMap<String, String>();
+        var score = 0;
+
+        var recentIndicators = stock.getIndicators()
+          .stream()
+          .filter(indicator -> indicator.getYear() < request.year())
+          .sorted((a, b) -> b.getYear() - a.getYear())
+          .limit(5)
+          .toList();
+        if (recentIndicators.size() < 5) {
+          return null;
+        }
+        var latestIndicator = recentIndicators.getFirst();
+
+        var roeScore = 0;
+        if (recentIndicators.stream().noneMatch(indicator -> indicator.getReturnOnEquity() == null || indicator.getReturnOnEquity() < 0)) {
+          var averageRoe = recentIndicators.stream()
+            .map(FinanceIndicator::getReturnOnEquity)
+            .map(item -> ObjectUtil.defaultIfNull(item, 0.0))
+            .mapToDouble(Double::doubleValue)
+            .average()
+            .orElse(0.0);
+          if (averageRoe >= 35) {
+            roeScore = 550;
+          } else if (averageRoe >= 30) {
+            roeScore = 500;
+          } else if (averageRoe >= 25) {
+            roeScore = 450;
+          } else if (averageRoe >= 20) {
+            roeScore = 400;
+          } else if (averageRoe >= 15) {
+            roeScore = 350;
+          } else if (averageRoe >= 10) {
+            roeScore = 300;
+          }
+          extra.put("平均ROE", NumberHelper.formatPriceDouble(averageRoe));
+        }
+        extra.put("平均ROE得分", NumberHelper.formatPriceDouble(roeScore));
+        score += roeScore;
+
+        var roaScore = 0;
+        if (recentIndicators.stream().noneMatch(indicator -> indicator.getReturnOnAssets() == null)) {
+          var averageRoa = recentIndicators.stream()
+            .map(FinanceIndicator::getReturnOnAssets)
+            .mapToDouble(Double::doubleValue)
+            .average()
+            .orElse(0.0);
+          if (averageRoa >= 15) {
+            roaScore = 100;
+          } else if (averageRoa >= 11) {
+            roaScore = 80;
+          } else if (averageRoa >= 7) {
+            roaScore = 50;
+          }
+          extra.put("平均ROA", NumberHelper.formatPriceDouble(averageRoa));
+        }
+        extra.put("平均ROA得分", NumberHelper.formatPriceDouble(roaScore));
+        score += roaScore;
+
+        var netProfitScore = 0;
+        if (recentIndicators.stream().noneMatch(indicator -> indicator.getNetProfit() == null)) {
+          var averageNetProfit = recentIndicators.stream()
+            .map(FinanceIndicator::getNetProfit)
+            .mapToDouble(Double::doubleValue)
+            .average()
+            .orElse(0.0);
+          if (averageNetProfit >= 10000.0 * 10000000) {
+            netProfitScore = 150;
+          } else if (averageNetProfit >= 1000.0 * 10000000) {
+            netProfitScore = 100;
+          }
+          extra.put("平均净利润", NumberHelper.formatPriceDouble(averageNetProfit));
+        }
+        extra.put("平均净利润得分", NumberHelper.formatPriceDouble(netProfitScore));
+        score += netProfitScore;
+
+        var cashScore = 0;
+        if (
+          ArrayUtil.isAllNotNull(latestIndicator.getTotalAssetsTurnover(), latestIndicator.getCashAndCashEquivalentsToTotalAssetsRatio())
+            && (
+            latestIndicator.getTotalAssetsTurnover() > 0.8 && latestIndicator.getCashAndCashEquivalentsToTotalAssetsRatio() >= 0.1
+              || latestIndicator.getTotalAssetsTurnover() <= 0.8 && latestIndicator.getCashAndCashEquivalentsToTotalAssetsRatio() >= 0.2
+          )
+        ) {
+          cashScore = 50;
+        }
+        extra.put("现金流得分", NumberHelper.formatPriceDouble(cashScore));
+        score += cashScore;
+
+        if (ObjectUtil.isNotNull(latestIndicator.getDaysAccountsReceivableTurnover()) && latestIndicator.getDaysAccountsReceivableTurnover() <= 30) {
+          extra.put("应收账款周转天数得分", "20");
+          score += 20;
+        }
+        if (ObjectUtil.isNotNull(latestIndicator.getDaysInventoryTurnover()) && latestIndicator.getDaysInventoryTurnover() <= 30) {
+          extra.put("存货周转天数得分", "20");
+          score += 20;
+        }
+        if (ArrayUtil.isAllNotNull(latestIndicator.getDaysAccountsReceivableTurnover(), latestIndicator.getDaysInventoryTurnover())) {
+          if (latestIndicator.getDaysAccountsReceivableTurnover() + latestIndicator.getDaysInventoryTurnover() <= 40) {
+            score += 20;
+          } else if (latestIndicator.getDaysAccountsReceivableTurnover() + latestIndicator.getDaysInventoryTurnover() <= 60) {
+            score += 10;
+          }
+        }
+
+        if (recentIndicators.stream().noneMatch(indicator -> indicator.getOperatingGrossProfitMargin() == null)) {
+          var stat = new DescriptiveStatistics();
+          recentIndicators.stream()
+            .map(FinanceIndicator::getOperatingGrossProfitMargin)
+            .mapToDouble(Double::doubleValue)
+            .forEach(stat::addValue);
+          if (stat.getStandardDeviation() <= 0.3) {
+            extra.put("毛利率标准差得分", "50");
+            score += 50;
+          }
+        }
+
+        var operatingSafeMarginScore = 0;
+        if (ObjectUtil.isNotNull(latestIndicator.getOperatingSafetyMarginRatio())) {
+          if (latestIndicator.getOperatingSafetyMarginRatio() >= 70) {
+            operatingSafeMarginScore = 50;
+          } else if (latestIndicator.getOperatingSafetyMarginRatio() >= 50) {
+            operatingSafeMarginScore = 30;
+          } else if (latestIndicator.getOperatingSafetyMarginRatio() >= 30) {
+            operatingSafeMarginScore = 10;
+          }
+          extra.put("安全边际比率", NumberHelper.formatPriceDouble(latestIndicator.getOperatingSafetyMarginRatio()));
+        }
+        extra.put("安全边际比率得分", NumberHelper.formatPriceDouble(operatingSafeMarginScore));
+        score += operatingSafeMarginScore;
+
+        var netProfitAscendingScore = 0;
+        if (recentIndicators.stream().noneMatch(indicator -> indicator.getNetProfit() == null)) {
+          if (recentIndicators.get(0).getNetProfit() > recentIndicators.get(1).getNetProfit()) {
+            netProfitAscendingScore += 30;
+          } else {
+            netProfitAscendingScore -= 30;
+          }
+          if (recentIndicators.get(1).getNetProfit() > recentIndicators.get(2).getNetProfit()) {
+            netProfitAscendingScore += 25;
+          } else {
+            netProfitAscendingScore -= 25;
+          }
+
+          if (recentIndicators.get(2).getNetProfit() > recentIndicators.get(3).getNetProfit()) {
+            netProfitAscendingScore += 20;
+          } else {
+            netProfitAscendingScore -= 20;
+          }
+
+          if (recentIndicators.get(3).getNetProfit() > recentIndicators.get(4).getNetProfit()) {
+            netProfitAscendingScore += 15;
+          } else {
+            netProfitAscendingScore -= 15;
+          }
+        }
+        extra.put("近五年净利润得分", NumberHelper.formatPriceDouble(netProfitAscendingScore));
+        score += netProfitAscendingScore;
+
+        var cashAscendingScore = 0;
+        if (recentIndicators.stream().noneMatch(indicator -> indicator.getCashAndCashEquivalents() == null)) {
+          if (recentIndicators.get(0).getCashAndCashEquivalents() > recentIndicators.get(1).getCashAndCashEquivalents()) {
+            cashAscendingScore += 30;
+          } else {
+            cashAscendingScore -= 30;
+          }
+
+          if (recentIndicators.get(1).getCashAndCashEquivalents() > recentIndicators.get(2).getCashAndCashEquivalents()) {
+            cashAscendingScore += 25;
+          } else {
+            cashAscendingScore -= 25;
+          }
+
+          if (recentIndicators.get(2).getCashAndCashEquivalents() > recentIndicators.get(3).getCashAndCashEquivalents()) {
+            cashAscendingScore += 20;
+          } else {
+            cashAscendingScore -= 20;
+          }
+
+          if (recentIndicators.get(3).getCashAndCashEquivalents() > recentIndicators.get(4).getCashAndCashEquivalents()) {
+            cashAscendingScore += 15;
+          } else {
+            cashAscendingScore -= 15;
+          }
+        }
+        extra.put("近五年现金流得分", NumberHelper.formatPriceDouble(cashAscendingScore));
+        score += cashAscendingScore;
+
+        return new Candidate(stock, score, extra);
+      })
+      .filter(ObjectUtil::isNotNull)
+      .sorted(Comparator.comparingDouble(Candidate::score).reversed())
+      .limit(request.limit)
       .collect(Collectors.toSet());
   }
 

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/service/selector/StockSelector.java

@@ -13,7 +13,7 @@ import java.util.Set;
 public interface StockSelector<T> {
   Set<Candidate> select(T request);
 
-  record Candidate(Stock stock, double score, Map<String, Object> extra) {
+  record Candidate(Stock stock, double score, Map<String, String> extra) {
     public Candidate(Stock stock, double score) {
       this(stock, score, Map.of());
     }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/strategy/TradeEngine.java

@@ -0,0 +1,125 @@
+package com.lanyuanxiaoyao.leopard.core.strategy;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.lanyuanxiaoyao.leopard.core.entity.Daily;
+import com.lanyuanxiaoyao.leopard.core.entity.QDaily;
+import com.lanyuanxiaoyao.leopard.core.entity.Stock;
+import com.lanyuanxiaoyao.leopard.core.repository.DailyRepository;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 交易策略
+ *
+ * @author lanyuanxiaoyao
+ * @version 20251016
+ */
+@Slf4j
+@Service
+public class TradeEngine {
+  private final DailyRepository dailyRepository;
+
+  public TradeEngine(DailyRepository dailyRepository) {
+    this.dailyRepository = dailyRepository;
+  }
+
+  public Asset backtest(Stock stock, TradeStrategy strategy, LocalDate startDate, LocalDate endDate) {
+    var dailies = dailyRepository.findAll(
+      QDaily.daily.stock.eq(stock)
+        .and(QDaily.daily.tradeDate.before(endDate)),
+      QDaily.daily.tradeDate.asc()
+    );
+    var validTradeDates = dailies.stream()
+      .map(Daily::getTradeDate)
+      .distinct()
+      .toList();
+    var asset = new Asset();
+    for (var now = startDate; now.isBefore(endDate) || now.isEqual(endDate); now = now.plusDays(1)) {
+      if (!validTradeDates.contains(now)) {
+        continue;
+      }
+      final var currentDate = now;
+      var trade = strategy.trade(
+        now,
+        asset,
+        dailies.stream()
+          .filter(daily -> daily.getTradeDate().isBefore(currentDate))
+          .toList()
+      );
+      var daily = dailies.stream()
+        .filter(d -> ObjectUtil.equals(d.getTradeDate(), currentDate))
+        .findFirst()
+        .orElseThrow();
+      asset.addTrade(now, trade, daily.getHfqClose());
+    }
+    return asset;
+  }
+
+  public interface TradeStrategy {
+    int trade(LocalDate now, Asset asset, List<Daily> dailies);
+  }
+
+  @Data
+  public static final class Asset {
+    private List<Trade> trades = new ArrayList<>();
+
+    public void addTrade(LocalDate date, int volume, double price) {
+      trades.add(new Trade(date, volume, price));
+    }
+
+    public int getVolume() {
+      return getVolume(trade -> true);
+    }
+
+    public int getVolume(LocalDate date) {
+      return getVolume(trade -> trade.date().isBefore(date) || trade.date().isEqual(date));
+    }
+
+    private int getVolume(Predicate<Trade> predicate) {
+      return trades.stream()
+        .filter(predicate)
+        .mapToInt(Trade::volume)
+        .sum();
+    }
+
+    public double getCash() {
+      return getCash(trade -> true);
+    }
+
+    public double getCash(LocalDate date) {
+      return getCash(trade -> trade.date().isBefore(date) || trade.date().isEqual(date));
+    }
+
+    private double getCash(Predicate<Trade> predicate) {
+      return trades.stream()
+        .filter(predicate)
+        .mapToDouble(trade -> -1 * trade.volume() * trade.price())
+        .sum();
+    }
+
+    public double getPrice() {
+      return getPrice(trade -> true);
+    }
+
+    public double getPrice(LocalDate date) {
+      return getPrice(trade -> trade.date().isBefore(date) || trade.date().isEqual(date));
+    }
+
+    public double getPrice(Predicate<Trade> predicate) {
+      int volume = getVolume(predicate);
+      return volume == 0 ? 0 : getCash(predicate) / volume;
+    }
+
+    public record Trade(
+      LocalDate date,
+      int volume,
+      double price
+    ) {
+    }
+  }
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/PyramidSelect.java

@@ -0,0 +1,64 @@
+package com.lanyuanxiaoyao.leopard.core.task;
+
+import com.lanyuanxiaoyao.leopard.core.entity.StockCollection;
+import com.lanyuanxiaoyao.leopard.core.entity.StockScore;
+import com.lanyuanxiaoyao.leopard.core.repository.StockCollectionRepository;
+import com.lanyuanxiaoyao.leopard.core.service.selector.PyramidStockSelector;
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 金字塔选股
+ *
+ * @author lanyuanxiaoyao
+ * @version 20250925
+ */
+@Slf4j
+@Component
+public class PyramidSelect extends TaskRunner {
+  private final StockCollectionRepository stockCollectionRepository;
+
+  private final PyramidStockSelector pyramidStockSelector;
+
+  protected PyramidSelect(ApplicationContext context, StockCollectionRepository stockCollectionRepository, PyramidStockSelector pyramidStockSelector) {
+    super(context);
+    this.stockCollectionRepository = stockCollectionRepository;
+    this.pyramidStockSelector = pyramidStockSelector;
+  }
+
+  @Transactional(rollbackFor = Throwable.class)
+  @Override
+  public String process(Map<String, Object> params, StepUpdater updater) {
+    var candidates = pyramidStockSelector.select(new PyramidStockSelector.Request(LocalDate.now().getYear(), 50));
+
+    var collection = new StockCollection();
+    collection.setName("金字塔选股");
+    collection.setDescription("金字塔选股");
+    collection.setScores(
+      candidates.stream()
+        .map(candidate -> {
+          var score = new StockScore();
+          score.setStock(candidate.stock());
+          score.setScore(candidate.score());
+          score.setExtra(candidate.extra());
+          score.setCollection(collection);
+          return score;
+        })
+        .collect(Collectors.toSet())
+    );
+    stockCollectionRepository.save(collection);
+
+    return """
+      | Code | Name | Score |
+      | ---- | ---- | ----- |
+      %s
+      """.formatted(candidates.stream()
+      .map(candidate -> "| %s | %s | %.2f |".formatted(candidate.stock().getCode(), candidate.stock().getName(), candidate.score()))
+      .collect(Collectors.joining("\n")));
+  }
+}

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/TaskRunner.java

@@ -1,11 +1,11 @@
-package com.lanyuanxiaoyao.leopard.server.service.task;
+package com.lanyuanxiaoyao.leopard.core.task;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.lanyuanxiaoyao.leopard.core.entity.Task;
 import com.lanyuanxiaoyao.leopard.core.repository.TaskRepository;
-import com.lanyuanxiaoyao.leopard.server.service.TaskService;
+import com.lanyuanxiaoyao.leopard.core.service.TaskService;
 import java.time.LocalDateTime;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
@@ -37,7 +37,11 @@ public abstract class TaskRunner {
     taskRepository.saveAndFlush(task);
 
     try {
-      var result = process(params, step -> taskRepository.updateStepById(task.getId(), step));
+      var result = process(params, step -> {
+        synchronized (task) {
+          taskRepository.updateStepById(task.getId(), step);
+        }
+      });
 
       task.setStatus(Task.Status.SUCCESS);
       task.setStep(1.0);

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateDailyTask.java

@@ -1,24 +1,26 @@
-package com.lanyuanxiaoyao.leopard.server.service.task;
+package com.lanyuanxiaoyao.leopard.core.task;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.lanyuanxiaoyao.leopard.core.entity.Daily;
 import com.lanyuanxiaoyao.leopard.core.entity.Stock;
+import com.lanyuanxiaoyao.leopard.core.helper.NumberHelper;
 import com.lanyuanxiaoyao.leopard.core.repository.DailyRepository;
 import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
-import com.lanyuanxiaoyao.leopard.server.helper.NumberHelper;
-import com.lanyuanxiaoyao.leopard.server.service.TuShareService;
+import com.lanyuanxiaoyao.leopard.core.service.TuShareService;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 /**
  * 更新日线数据
@@ -32,16 +34,18 @@ public class UpdateDailyTask extends TaskRunner {
   private final StockRepository stockRepository;
   private final DailyRepository dailyRepository;
 
+  private final TransactionTemplate transactionTemplate;
+
   private final TuShareService tuShareService;
 
-  protected UpdateDailyTask(ApplicationContext context, StockRepository stockRepository, DailyRepository dailyRepository, TuShareService tuShareService) {
+  protected UpdateDailyTask(ApplicationContext context, StockRepository stockRepository, DailyRepository dailyRepository, TransactionTemplate transactionTemplate, TuShareService tuShareService) {
     super(context);
     this.stockRepository = stockRepository;
     this.dailyRepository = dailyRepository;
+    this.transactionTemplate = transactionTemplate;
     this.tuShareService = tuShareService;
   }
 
-  @Transactional(rollbackFor = Throwable.class)
   @Override
   public String process(Map<String, Object> params, StepUpdater updater) throws Exception {
     var tradeDates = new HashSet<LocalDate>();
@@ -56,40 +60,48 @@ public class UpdateDailyTask extends TaskRunner {
     var existsTradeDates = dailyRepository.findDistinctTradeDate();
     var nowDate = LocalDate.now();
     var stocksMap = stockRepository.findAll().stream().collect(Collectors.toMap(Stock::getCode, stock -> stock));
-    tradeDates.parallelStream()
+    var targetTradeDates = tradeDates.stream()
       .filter(date -> date.isBefore(nowDate) || date.isEqual(nowDate))
       .filter(date -> !existsTradeDates.contains(date))
+      .toList();
+    var total = targetTradeDates.size();
+    var finished = new AtomicInteger(0);
+    targetTradeDates.parallelStream()
       .forEach(tradeDate -> {
         var factorResponse = tuShareService.factorList(tradeDate);
         var factorMap = new HashMap<String, Double>();
         for (List<String> item : factorResponse.data().items()) {
           factorMap.put(item.get(0), Double.valueOf(item.get(2)));
         }
-
-        var response = tuShareService.dailyList(tradeDate);
-        for (List<String> item : response.data().items()) {
-          var code = item.get(0);
-          if (stocksMap.containsKey(code)) {
-            var stock = stocksMap.get(code);
-            var factor = factorMap.get(code);
-            var daily = new Daily();
-            daily.setTradeDate(tradeDate);
-            daily.setOpen(NumberHelper.parseDouble(item.get(2)));
-            daily.setHigh(NumberUtil.parseDouble(item.get(3)));
-            daily.setLow(NumberUtil.parseDouble(item.get(4)));
-            daily.setClose(NumberUtil.parseDouble(item.get(5)));
-            daily.setPreviousClose(NumberUtil.parseDouble(item.get(6)));
-            daily.setPriceChangeAmount(NumberUtil.parseDouble(item.get(7)));
-            daily.setPriceFluctuationRange(NumberUtil.parseDouble(item.get(8)));
-            daily.setVolume(NumberUtil.parseDouble(item.get(9)));
-            daily.setTurnover(NumberUtil.parseDouble(item.get(10)));
-            daily.setFactor(factor);
-            daily.setStock(stock);
-            dailyRepository.save(daily);
+        transactionTemplate.execute(status -> {
+          var response = tuShareService.dailyList(tradeDate);
+          var dailies = new ArrayList<Daily>();
+          for (List<String> item : response.data().items()) {
+            var code = item.get(0);
+            if (stocksMap.containsKey(code)) {
+              var stock = stocksMap.get(code);
+              var factor = factorMap.get(code);
+              var daily = new Daily();
+              daily.setTradeDate(tradeDate);
+              daily.setOpen(NumberHelper.parseDouble(item.get(2)));
+              daily.setHigh(NumberUtil.parseDouble(item.get(3)));
+              daily.setLow(NumberUtil.parseDouble(item.get(4)));
+              daily.setClose(NumberUtil.parseDouble(item.get(5)));
+              daily.setPreviousClose(NumberUtil.parseDouble(item.get(6)));
+              daily.setPriceChangeAmount(NumberUtil.parseDouble(item.get(7)));
+              daily.setPriceFluctuationRange(NumberUtil.parseDouble(item.get(8)));
+              daily.setVolume(NumberUtil.parseDouble(item.get(9)));
+              daily.setTurnover(NumberUtil.parseDouble(item.get(10)));
+              daily.setFactor(factor);
+              daily.setStock(stock);
+              dailies.add(daily);
+            }
           }
-        }
+          dailyRepository.saveAll(dailies);
+          return null;
+        });
+        updater.update(finished.incrementAndGet() * 1.0 / total);
       });
-
     return null;
   }
 }

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateFinanceIndicatorTask.java

@@ -1,4 +1,4 @@
-package com.lanyuanxiaoyao.leopard.server.service.task;
+package com.lanyuanxiaoyao.leopard.core.task;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -6,10 +6,10 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.lanyuanxiaoyao.leopard.core.entity.FinanceIndicator;
 import com.lanyuanxiaoyao.leopard.core.entity.QFinanceIndicator;
 import com.lanyuanxiaoyao.leopard.core.entity.Stock;
+import com.lanyuanxiaoyao.leopard.core.helper.NumberHelper;
 import com.lanyuanxiaoyao.leopard.core.repository.FinanceIndicatorRepository;
 import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
-import com.lanyuanxiaoyao.leopard.server.helper.NumberHelper;
-import com.lanyuanxiaoyao.leopard.server.service.TuShareService;
+import com.lanyuanxiaoyao.leopard.core.service.TuShareService;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +17,7 @@ import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 更新财务指标数据
@@ -39,6 +40,7 @@ public class UpdateFinanceIndicatorTask extends TaskRunner {
     this.tuShareService = tuShareService;
   }
 
+  @Transactional(rollbackFor = Throwable.class)
   @Override
   public String process(Map<String, Object> params, StepUpdater updater) throws JsonProcessingException {
     var stocks = stockRepository.findAll();

leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/task/UpdateStockTask.java

@@ -1,9 +1,9 @@
-package com.lanyuanxiaoyao.leopard.server.service.task;
+package com.lanyuanxiaoyao.leopard.core.task;
 
 import cn.hutool.core.util.EnumUtil;
 import com.lanyuanxiaoyao.leopard.core.entity.Stock;
 import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
-import com.lanyuanxiaoyao.leopard.server.service.TuShareService;
+import com.lanyuanxiaoyao.leopard.core.service.TuShareService;
 import java.time.LocalDate;
 import java.util.Map;
 import java.util.stream.Collectors;

leopard-server/pom.xml

@@ -31,6 +31,14 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-jetty</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-cache</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-configuration-processor</artifactId>
@@ -41,24 +49,6 @@
       <artifactId>spring-boot-starter-quartz</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>cn.hutool</groupId>
-      <artifactId>hutool-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>cn.hutool</groupId>
-      <artifactId>hutool-http</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>io.github.ralfkonrad.quantlib_for_maven</groupId>
-      <artifactId>quantlib</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ta4j</groupId>
-      <artifactId>ta4j-core</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.mysql</groupId>
       <artifactId>mysql-connector-j</artifactId>

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/LeopardServerApplication.java

@@ -1,5 +1,7 @@
 package com.lanyuanxiaoyao.leopard.server;
 
+import com.lanyuanxiaoyao.leopard.core.repository.TaskRepository;
+import jakarta.transaction.Transactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -15,11 +17,20 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 @SpringBootApplication(scanBasePackages = "com.lanyuanxiaoyao.leopard")
 @EnableJpaAuditing
 public class LeopardServerApplication implements ApplicationRunner {
+  private final TaskRepository taskRepository;
+
+  public LeopardServerApplication(TaskRepository taskRepository) {
+    this.taskRepository = taskRepository;
+  }
+
   public static void main(String[] args) {
     SpringApplication.run(LeopardServerApplication.class, args);
   }
 
+  @Transactional(rollbackOn = Throwable.class)
   @Override
   public void run(ApplicationArguments args) {
+    log.warn("更新所有未完成的任务状态为失败");
+    taskRepository.updateAllRunningTaskToFailure();
   }
 }

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/configuration/CacheProvider.java

@@ -0,0 +1,35 @@
+package com.lanyuanxiaoyao.leopard.server.configuration;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.concurrent.TimeUnit;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+/**
+ * 缓存提供
+ *
+ * @author lanyuanxiaoyao
+ * @date 2023-04-23
+ */
+@Configuration
+@EnableCaching
+public class CacheProvider {
+  @Primary
+  @Bean("short-cache")
+  public CacheManager normalCache() {
+    CaffeineCacheManager manager = new CaffeineCacheManager();
+    manager.setCaffeine(Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES));
+    return manager;
+  }
+
+  @Bean("long-cache")
+  public CacheManager longCache() {
+    CaffeineCacheManager manager = new CaffeineCacheManager();
+    manager.setCaffeine(Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS));
+    return manager;
+  }
+}

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/CommonOptionsController.java

@@ -3,9 +3,10 @@ package com.lanyuanxiaoyao.leopard.server.controller;
 import com.lanyuanxiaoyao.leopard.core.entity.Stock;
 import com.lanyuanxiaoyao.leopard.core.entity.Task;
 import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
-import com.lanyuanxiaoyao.leopard.server.service.TaskService;
+import com.lanyuanxiaoyao.leopard.core.service.TaskService;
 import com.lanyuanxiaoyao.service.template.controller.GlobalResponse;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -100,18 +101,21 @@ public class CommonOptionsController {
       case "stock_market" -> GlobalResponse.responseSuccess(
         Arrays.stream(Stock.Market.values())
           .map(market -> new Option(market.getChineseName(), market.name()))
+          .sorted(Comparator.comparing(Option::label))
           .toList()
       );
       case "stock_industry" -> GlobalResponse.responseSuccess(
         stockRepository.findDistinctIndustries()
           .stream()
           .map(industry -> new Option(industry, industry))
+          .sorted(Comparator.comparing(Option::label))
           .toList()
       );
       case "task_template_id" -> GlobalResponse.responseSuccess(
         taskService.getTemplates()
           .stream()
           .map(template -> new Option(template.name(), template.id()))
+          .sorted(Comparator.comparing(Option::label))
           .toList()
       );
       default -> GlobalResponse.responseSuccess(List.of());

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/QuartzController.java

@@ -1,7 +1,7 @@
 package com.lanyuanxiaoyao.leopard.server.controller;
 
+import com.lanyuanxiaoyao.leopard.core.service.TaskService;
 import com.lanyuanxiaoyao.leopard.server.service.QuartzService;
-import com.lanyuanxiaoyao.leopard.server.service.TaskService;
 import com.lanyuanxiaoyao.service.template.controller.GlobalResponse;
 import java.time.LocalDateTime;
 import java.util.List;

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockCollectionController.java

@@ -1,38 +1,32 @@
 package com.lanyuanxiaoyao.leopard.server.controller;
 
 import com.lanyuanxiaoyao.leopard.core.entity.StockCollection;
-import com.lanyuanxiaoyao.leopard.server.entity.StockDetailVo;
-import com.lanyuanxiaoyao.leopard.server.service.StockCollectionService;
-import com.lanyuanxiaoyao.leopard.server.service.StockService;
+import com.lanyuanxiaoyao.leopard.core.service.StockCollectionService;
+import com.lanyuanxiaoyao.leopard.server.entity.StockScoreVo;
+import com.lanyuanxiaoyao.service.template.controller.GlobalResponse;
 import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport;
-import java.util.HashSet;
-import java.util.Set;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.List;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("stock_collection")
-public class StockCollectionController extends SimpleControllerSupport<StockCollection, StockCollectionController.SaveItem, StockCollectionController.ListItem, StockCollectionController.DetailItem> {
-  private final StockService stockService;
-
-  public StockCollectionController(StockCollectionService service, StockService stockService) {
+public class StockCollectionController extends SimpleControllerSupport<StockCollection, Void, StockCollectionController.ListItem, StockCollectionController.DetailItem> {
+  public StockCollectionController(StockCollectionService service) {
     super(service);
-    this.stockService = stockService;
   }
 
   @Override
-  protected Function<SaveItem, StockCollection> saveItemMapper() {
-    return item -> {
-      var collection = new StockCollection();
-      collection.setId(item.id());
-      collection.setName(item.name());
-      collection.setDescription(item.description());
-      var stocks = stockService.list(item.stockIds());
-      collection.setStocks(new HashSet<>(stocks));
-      return collection;
-    };
+  public GlobalResponse<Long> save(Void unused) throws Exception {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  protected Function<Void, StockCollection> saveItemMapper() {
+    throw new UnsupportedOperationException();
   }
 
   @Override
@@ -41,7 +35,9 @@ public class StockCollectionController extends SimpleControllerSupport<StockColl
       collection.getId(),
       collection.getName(),
       collection.getDescription(),
-      collection.getStocks().size()
+      collection.getScores().size(),
+      collection.getCreatedTime(),
+      collection.getModifiedTime()
     );
   }
 
@@ -51,27 +47,24 @@ public class StockCollectionController extends SimpleControllerSupport<StockColl
       collection.getId(),
       collection.getName(),
       collection.getDescription(),
-      collection.getStocks().size(),
-      collection.getStocks()
+      collection.getScores().size(),
+      collection.getScores()
         .stream()
-        .map(StockDetailVo::of)
-        .collect(Collectors.toSet())
+        .map(StockScoreVo::of)
+        .sorted(Comparator.comparing(StockScoreVo::score).reversed())
+        .toList(),
+      collection.getCreatedTime(),
+      collection.getModifiedTime()
     );
   }
 
-  public record SaveItem(
-    Long id,
-    String name,
-    String description,
-    Set<Long> stockIds
-  ) {
-  }
-
   public record ListItem(
     Long id,
     String name,
     String description,
-    Integer count
+    Integer count,
+    LocalDateTime createdTime,
+    LocalDateTime modifiedTime
   ) {
   }
 
@@ -80,7 +73,9 @@ public class StockCollectionController extends SimpleControllerSupport<StockColl
     String name,
     String description,
     Integer count,
-    Set<StockDetailVo> stocks
+    List<StockScoreVo> scores,
+    LocalDateTime createdTime,
+    LocalDateTime modifiedTime
   ) {
   }
 }

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/StockController.java

@@ -1,10 +1,12 @@
 package com.lanyuanxiaoyao.leopard.server.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.lanyuanxiaoyao.leopard.core.entity.Daily;
 import com.lanyuanxiaoyao.leopard.core.entity.Stock;
+import com.lanyuanxiaoyao.leopard.core.helper.NumberHelper;
+import com.lanyuanxiaoyao.leopard.core.helper.TaHelper;
+import com.lanyuanxiaoyao.leopard.core.service.StockService;
 import com.lanyuanxiaoyao.leopard.server.entity.StockDetailVo;
-import com.lanyuanxiaoyao.leopard.server.helper.NumberHelper;
-import com.lanyuanxiaoyao.leopard.server.service.StockService;
 import com.lanyuanxiaoyao.service.template.controller.GlobalResponse;
 import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport;
 import java.time.LocalDate;
@@ -108,14 +110,61 @@ public class StockController extends SimpleControllerSupport<Stock, Void, StockD
     ));
   }
 
+  @GetMapping("daily/current/{id}")
+  public GlobalResponse<Map<String, Object>> dailyCurrent(@PathVariable("id") Long id) {
+    var daily = stockService.findDailyLatest(id);
+    return GlobalResponse.responseMapData(Map.of(
+      "date", daily.map(Daily::getTradeDate).map(LocalDate::toString).orElse("/"),
+      "open", daily.map(Daily::getOpen).map(NumberHelper::formatPriceDouble).orElse(NumberHelper.FINANCE_NULL_DOUBLE),
+      "close", daily.map(Daily::getClose).map(NumberHelper::formatPriceDouble).orElse(NumberHelper.FINANCE_NULL_DOUBLE),
+      "low", daily.map(Daily::getLow).map(NumberHelper::formatPriceDouble).orElse(NumberHelper.FINANCE_NULL_DOUBLE),
+      "high", daily.map(Daily::getHigh).map(NumberHelper::formatPriceDouble).orElse(NumberHelper.FINANCE_NULL_DOUBLE)
+    ));
+  }
+
   @GetMapping("daily/{id}")
   public GlobalResponse<Map<String, Object>> dailyCharts(@PathVariable("id") Long id) {
-    var data = stockService.findDailyRecent(id, 100);
+    var data = stockService.findDailyRecent(id, 100 + 60);
+    log.info("Size: {}", data.size());
     var xList = new ArrayList<String>();
     var yList = new ArrayList<List<Double>>();
-    for (var daily : data) {
+    for (var daily : data.subList(60, data.size() - 1)) {
       xList.add(daily.getTradeDate().toString());
-      yList.add(List.of(daily.getOpen(), daily.getClose(), daily.getLow(), daily.getHigh()));
+      yList.add(List.of(daily.getHfqOpen(), daily.getHfqClose(), daily.getHfqLow(), daily.getHfqHigh()));
+    }
+    return GlobalResponse.responseMapData(Map.of(
+      "xList", xList,
+      "yList", yList,
+      "sma10", TaHelper.sma(data, 10, Daily::getHfqClose).subList(60, data.size() - 1),
+      "sma30", TaHelper.sma(data, 30, Daily::getHfqClose).subList(60, data.size() - 1),
+      "sma60", TaHelper.sma(data, 60, Daily::getHfqClose).subList(60, data.size() - 1)
+    ));
+  }
+
+  @SuppressWarnings("DuplicatedCode")
+  @GetMapping("weekly/{id}")
+  public GlobalResponse<Map<String, Object>> weeklyCharts(@PathVariable("id") Long id) {
+    var data = stockService.findWeeklyRecent(id, 50);
+    var xList = new ArrayList<String>();
+    var yList = new ArrayList<List<Double>>();
+    for (var weekly : data) {
+      xList.add(weekly.tradeDate().toString());
+      yList.add(List.of(weekly.open(), weekly.close(), weekly.low(), weekly.high()));
+    }
+    return GlobalResponse.responseMapData(Map.of(
+      "xList", xList, "yList", yList
+    ));
+  }
+
+  @SuppressWarnings("DuplicatedCode")
+  @GetMapping("monthly/{id}")
+  public GlobalResponse<Map<String, Object>> monthlyCharts(@PathVariable("id") Long id) {
+    var data = stockService.findMonthlyRecent(id, 24);
+    var xList = new ArrayList<String>();
+    var yList = new ArrayList<List<Double>>();
+    for (var monthly : data) {
+      xList.add(monthly.tradeDate().toString());
+      yList.add(List.of(monthly.open(), monthly.close(), monthly.low(), monthly.high()));
     }
     return GlobalResponse.responseMapData(Map.of(
       "xList", xList, "yList", yList

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskController.java

@@ -4,11 +4,12 @@ import cn.hutool.core.date.BetweenFormatter;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.lanyuanxiaoyao.leopard.core.entity.Task;
-import com.lanyuanxiaoyao.leopard.server.service.TaskService;
+import com.lanyuanxiaoyao.leopard.core.service.TaskService;
 import com.lanyuanxiaoyao.service.template.controller.GlobalResponse;
 import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport;
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.Map;
 import java.util.function.Function;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +49,10 @@ public class TaskController extends SimpleControllerSupport<Task, Void, TaskCont
 
   @GetMapping("template/list")
   public GlobalResponse<Map<String, Object>> templateList() {
-    var templates = taskService.getTemplates();
+    var templates = taskService.getTemplates()
+      .stream()
+      .sorted(Comparator.comparing(TaskService.TaskTemplate::name))
+      .toList();
     return GlobalResponse.responseCrudData(templates, templates.size());
   }
 
@@ -58,8 +62,10 @@ public class TaskController extends SimpleControllerSupport<Task, Void, TaskCont
   }
 
   private TaskCost calculateCost(LocalDateTime start, LocalDateTime finish) {
-    if (ObjectUtil.isNull(start) || ObjectUtil.isNull(finish)) {
+    if (ObjectUtil.isNull(start)) {
       return new TaskCost(null, null);
+    } else if (ObjectUtil.isNull(finish)) {
+      finish = LocalDateTime.now();
     }
     var duration = Duration.between(start, finish).toMillis();
     return new TaskCost(

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/entity/StockScoreVo.java

@@ -0,0 +1,42 @@
+package com.lanyuanxiaoyao.leopard.server.entity;
+
+import com.lanyuanxiaoyao.leopard.core.entity.Stock;
+import com.lanyuanxiaoyao.leopard.core.entity.StockScore;
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250917
+ */
+public record StockScoreVo(
+  Long id,
+  String code,
+  String name,
+  String fullname,
+  Stock.Market market,
+  String industry,
+  LocalDate listedDate,
+  Double score,
+  String extra
+) {
+  public static StockScoreVo of(StockScore score) {
+    return new StockScoreVo(
+      score.getStock().getId(),
+      score.getStock().getCode(),
+      score.getStock().getName(),
+      score.getStock().getFullname(),
+      score.getStock().getMarket(),
+      score.getStock().getIndustry(),
+      score.getStock().getListedDate(),
+      score.getScore(),
+      score.getExtra()
+        .entrySet()
+        .stream()
+        .sorted(Map.Entry.comparingByKey())
+        .map(entry -> entry.getKey() + ": " + entry.getValue())
+        .collect(Collectors.joining("<br>"))
+    );
+  }
+}

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java

@@ -3,6 +3,7 @@ package com.lanyuanxiaoyao.leopard.server.service;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.lanyuanxiaoyao.leopard.core.service.TaskService;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/StockService.java

@@ -1,63 +0,0 @@
-package com.lanyuanxiaoyao.leopard.server.service;
-
-import com.lanyuanxiaoyao.leopard.core.entity.Daily;
-import com.lanyuanxiaoyao.leopard.core.entity.Daily_;
-import com.lanyuanxiaoyao.leopard.core.entity.FinanceIndicator;
-import com.lanyuanxiaoyao.leopard.core.entity.FinanceIndicator_;
-import com.lanyuanxiaoyao.leopard.core.entity.QDaily;
-import com.lanyuanxiaoyao.leopard.core.entity.QFinanceIndicator;
-import com.lanyuanxiaoyao.leopard.core.entity.Stock;
-import com.lanyuanxiaoyao.leopard.core.repository.DailyRepository;
-import com.lanyuanxiaoyao.leopard.core.repository.FinanceIndicatorRepository;
-import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
-import com.lanyuanxiaoyao.service.template.service.SimpleServiceSupport;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Optional;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lanyuanxiaoyao
- * @version 20250828
- */
-@Slf4j
-@Service
-public class StockService extends SimpleServiceSupport<Stock> {
-  private final StockRepository stockRepository;
-  private final FinanceIndicatorRepository financeIndicatorRepository;
-  private final DailyRepository dailyRepository;
-
-  public StockService(StockRepository repository, FinanceIndicatorRepository financeIndicatorRepository, DailyRepository dailyRepository) {
-    super(repository);
-    this.stockRepository = repository;
-    this.financeIndicatorRepository = financeIndicatorRepository;
-    this.dailyRepository = dailyRepository;
-  }
-
-  public Optional<FinanceIndicator> findFinanceIndicator(Long stockId, Integer year) {
-    return financeIndicatorRepository.findOne(
-      QFinanceIndicator.financeIndicator.year.eq(year)
-        .and(QFinanceIndicator.financeIndicator.stock.id.eq(stockId))
-    );
-  }
-
-  public List<FinanceIndicator> findFinanceIndicatorRecent(Long stockId, int years) {
-    var current = LocalDate.now();
-    return financeIndicatorRepository.findAll(
-      QFinanceIndicator.financeIndicator.stock.id.eq(stockId)
-        .and(QFinanceIndicator.financeIndicator.year.between(current.minusYears(years).getYear(), current.getYear())),
-      Sort.by(Sort.Direction.ASC, FinanceIndicator_.YEAR)
-    );
-  }
-
-  public List<Daily> findDailyRecent(Long stockId, int days) {
-    var current = LocalDate.now();
-    return dailyRepository.findAll(
-      QDaily.daily.stock.id.eq(stockId)
-        .and(QDaily.daily.tradeDate.between(current.minusDays(days), current)),
-      Sort.by(Sort.Direction.ASC, Daily_.TRADE_DATE)
-    );
-  }
-}

leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateYearlyTask.java

@@ -1,72 +0,0 @@
-package com.lanyuanxiaoyao.leopard.server.service.task;
-
-import com.lanyuanxiaoyao.leopard.core.entity.Daily;
-import com.lanyuanxiaoyao.leopard.core.entity.QDaily;
-import com.lanyuanxiaoyao.leopard.core.entity.QYearly;
-import com.lanyuanxiaoyao.leopard.core.entity.Yearly;
-import com.lanyuanxiaoyao.leopard.core.repository.DailyRepository;
-import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
-import com.lanyuanxiaoyao.leopard.core.repository.YearlyRepository;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 更新年线指标
- *
- * @author lanyuanxiaoyao
- * @version 20250924
- */
-@Slf4j
-@Component
-public class UpdateYearlyTask extends TaskRunner {
-  private final StockRepository stockRepository;
-  private final DailyRepository dailyRepository;
-  private final YearlyRepository yearlyRepository;
-
-  protected UpdateYearlyTask(ApplicationContext context, StockRepository stockRepository, DailyRepository dailyRepository, YearlyRepository yearlyRepository) {
-    super(context);
-    this.stockRepository = stockRepository;
-    this.dailyRepository = dailyRepository;
-    this.yearlyRepository = yearlyRepository;
-  }
-
-  @Transactional(rollbackFor = Throwable.class)
-  @Override
-  public String process(Map<String, Object> params, StepUpdater updater) {
-    var startYear = dailyRepository.findMinTradeDate().getYear();
-    var endYear = dailyRepository.findMaxTradeDate().getYear();
-    var stocks = stockRepository.findAll();
-    for (int year = startYear, index = 0; year <= endYear; year++, index++) {
-      for (var stock : stocks) {
-        log.info("Processing {} {}", stock.getCode(), year);
-        if (stock.getListedDate().getYear() > year) {
-          continue;
-        }
-        var dailies = dailyRepository.findAll(
-          QDaily.daily.tradeDate.year().eq(year)
-            .and(QDaily.daily.stock.eq(stock))
-        );
-        var yearly = yearlyRepository.findOne(
-          QYearly.yearly.stock.eq(stock)
-            .and(QYearly.yearly.year.eq(year))
-        ).orElseGet(Yearly::new);
-        yearly.setStock(stock);
-        yearly.setYear(year);
-        yearly.setClose(dailies.getLast().getHfqClose());
-        yearly.setOpen(dailies.getFirst().getHfqOpen());
-        yearly.setHigh(dailies.stream().map(Daily::getHfqHigh).max(Double::compareTo).orElse(0.0));
-        yearly.setLow(dailies.stream().map(Daily::getHfqLow).min(Double::compareTo).orElse(0.0));
-        yearly.setVolume(dailies.stream().mapToDouble(Daily::getVolume).sum());
-        yearly.setTurnover(dailies.stream().mapToDouble(Daily::getTurnover).sum());
-        yearly.setPriceChangeAmount(yearly.getClose() - yearly.getOpen());
-        yearly.setPriceFluctuationRange((yearly.getClose() - yearly.getOpen()) / yearly.getOpen());
-        yearlyRepository.save(yearly);
-      }
-      updater.update((year - startYear) * 1.0 / (endYear - startYear + 1));
-    }
-    return null;
-  }
-}

leopard-server/src/main/resources/application-dev.yml

@@ -0,0 +1,3 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://127.0.0.1:6785/leopard_dev

leopard-server/src/main/resources/application-h2.yml

@@ -0,0 +1,14 @@
+spring:
+  datasource:
+    url: jdbc:h2:file:./leopard;DB_CLOSE_ON_EXIT=TRUE
+    username: leopard
+    password: leopard
+    driver-class-name: org.h2.Driver
+  quartz:
+    jdbc:
+      platform: h2
+    properties:
+      org:
+        quartz:
+          jobStore:
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate

leopard-server/src/main/resources/application.yml

@@ -23,7 +23,7 @@ spring:
     job-store-type: jdbc
     jdbc:
       platform: postgres
-      # initialize-schema: always
+      initialize-schema: always
     properties:
       org:
         quartz:

leopard-server/src/test/resources/tushare.http

@@ -109,7 +109,8 @@ Content-Type: application/json
   "api_name": "adj_factor",
   "token": "{{api_key}}",
   "params": {
-    "trade_date": "20241231"
+    "ts_code": "600018.SH",
+    "trade_date": "20060331"
   },
   "fields": [
     "ts_code",
@@ -126,12 +127,15 @@ Content-Type: application/json
   "api_name": "stk_factor_pro",
   "token": "{{api_key}}",
   "params": {
-    "ts_code": "000002.SZ",
-    "trade_date": "20250102"
+    "ts_code": "600018.SH",
+    "trade_date": "20060331"
   },
   "fields": [
     "ts_code",
     "trade_date",
+    "open",
+    "open_qfq",
+    "open_hfq",
     "close",
     "close_qfq",
     "close_hfq"

leopard-strategy/pom.xml

@@ -24,14 +24,6 @@
       <groupId>com.yomahub</groupId>
       <artifactId>liteflow-spring-boot-starter</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.github.ralfkonrad.quantlib_for_maven</groupId>
-      <artifactId>quantlib</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ta4j</groupId>
-      <artifactId>ta4j-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.commonmark</groupId>
       <artifactId>commonmark</artifactId>
@@ -42,6 +34,15 @@
       <artifactId>commonmark-ext-gfm-tables</artifactId>
       <version>0.26.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cn.hutool</groupId>
+      <artifactId>hutool-extra</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -53,6 +54,11 @@
       <artifactId>postgresql</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>

leopard-strategy/src/main/java/com/lanyuanxiaoyao/leopard/strategy/StrategyApplication.java

@@ -1,17 +1,32 @@
 package com.lanyuanxiaoyao.leopard.strategy;
 
-import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.lanyuanxiaoyao.leopard.core.service.AssessmentService;
-import com.lanyuanxiaoyao.leopard.core.service.selector.PyramidStockSelector;
-import com.lanyuanxiaoyao.leopard.core.service.selector.StockSelector;
+import cn.hutool.extra.template.TemplateConfig;
+import cn.hutool.extra.template.TemplateEngine;
+import cn.hutool.extra.template.TemplateUtil;
+import com.lanyuanxiaoyao.leopard.core.entity.Daily;
+import com.lanyuanxiaoyao.leopard.core.entity.QDaily;
+import com.lanyuanxiaoyao.leopard.core.entity.QStock;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.Monthly;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.Weekly;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.YearAndMonth;
+import com.lanyuanxiaoyao.leopard.core.entity.dto.YearAndWeek;
+import com.lanyuanxiaoyao.leopard.core.helper.TaHelper;
+import com.lanyuanxiaoyao.leopard.core.repository.DailyRepository;
+import com.lanyuanxiaoyao.leopard.core.repository.StockCollectionRepository;
+import com.lanyuanxiaoyao.leopard.core.repository.StockRepository;
+import com.lanyuanxiaoyao.leopard.core.strategy.TradeEngine;
 import jakarta.annotation.Resource;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.temporal.WeekFields;
 import java.util.ArrayList;
-import java.util.Map;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
@@ -21,310 +36,257 @@ import org.springframework.context.event.EventListener;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.lanyuanxiaoyao.leopard.core.helper.TaHelper.maxFromDaily;
+import static com.lanyuanxiaoyao.leopard.core.helper.TaHelper.minFromDaily;
+import static com.lanyuanxiaoyao.leopard.core.helper.TaHelper.sumFromDaily;
+
 @Slf4j
 @SpringBootApplication(scanBasePackages = "com.lanyuanxiaoyao.leopard")
 @EnableJpaAuditing
 public class StrategyApplication {
-  private static final ObjectMapper mapper = new ObjectMapper();
+  private static final TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH));
+
   @Resource
-  private PyramidStockSelector pyramidStockSelector;
+  private TradeEngine tradeEngine;
   @Resource
-  private AssessmentService assessmentService;
+  private StockRepository stockRepository;
+  @Resource
+  private DailyRepository dailyRepository;
+  @Resource
+  private StockCollectionRepository stockCollectionRepository;
 
   public static void main(String[] args) {
     SpringApplication.run(StrategyApplication.class, args);
   }
 
-  private static void render(Map<String, Object> data) throws IOException {
-    Files.writeString(
-      Path.of("result.html"),
-      StrUtil.format(
-        // language=HTML
-        """
-          <html lang='zh'>
-          <head>
-            <meta charset='utf-8'/>
-            <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-            <meta name='viewport' content='width=device-width, initial-scale=1.0'/>
-            <title>Strategy</title>
-            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/antd.min.css"/>
-            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/helper.min.css"/>
-            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/iconfont.min.css"/>
-            <style>
-              html, body, #root {
-                position: relative;
-                width: 100%;
-                height: 100%;
-                margin: 0;
-                padding: 0;
+  @Transactional(readOnly = true)
+  @EventListener(ApplicationReadyEvent.class)
+  public void backtest() throws IOException {
+    var startDate = LocalDate.of(2024, 12, 1);
+    var endDate = LocalDate.of(2024, 12, 31);
+    var charts = new ArrayList<Dict>();
+    List.of("000048.SZ", "000333.SZ", "000568.SZ", "000596.SZ", "000651.SZ", "000848.SZ", "000858.SZ", "000933.SZ", "002027.SZ", "002032.SZ", "002142.SZ", "002192.SZ", "002415.SZ", "002432.SZ", "002475.SZ", "002517.SZ", "002555.SZ", "002648.SZ", "002756.SZ", "002847.SZ", "600036.SH", "600096.SH"/*, "600132.SH", "600188.SH", "600309.SH", "600426.SH", "600436.SH", "600519.SH", "600546.SH", "600563.SH", "600702.SH", "600779.SH", "600803.SH", "600809.SH", "600961.SH", "601001.SH", "601100.SH", "601138.SH", "601225.SH", "601899.SH", "601919.SH", "603195.SH", "603198.SH", "603288.SH", "603369.SH", "603444.SH", "603565.SH", "603568.SH", "603605.SH", "603688.SH"*/)
+      .parallelStream()
+      .forEach(code -> {
+        var stock = stockRepository.findOne(QStock.stock.code.eq(code)).orElseThrow();
+        var asset = tradeEngine.backtest(
+          stockRepository.findById(stock.getId()).orElseThrow(),
+          (now, currentAsset, dailies) -> {
+            var stockDailies = dailies
+              .stream()
+              .sorted(Comparator.comparing(Daily::getTradeDate))
+              .toList();
+            var yesterday = stockDailies.getLast();
+            if (yesterday.getHfqClose() > yesterday.getHfqOpen()) {
+              return 100;
+            } else if (yesterday.getHfqClose() < yesterday.getHfqOpen()) {
+              var hold = currentAsset.getVolume();
+              if (hold > 0) {
+                return -1 * hold;
               }
-            </style>
-          </head>
-          <body>
-          <div id='root'/>
-          </body>
-          <script src="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/sdk.min.js"></script>
-          <script type='text/javascript'>
-            (function () {
-              const amis = amisRequire('amis/embed')
-              const amisJson = {
-                type: 'page',
-                title: 'Strategy',
-                data: {},
-                body: [
-                  /*{
-                    type: 'table2',
-                    source: '${items}',
-                    columns: [
-                      {
-                        name: 'date',
-                        label: 'Date',
-                        width: 100,
-                      },
-                      {
-                        name: 'code',
-                        label: 'Code',
-                        width: 100,
-                      },
-                      {
-                        name: 'name',
-                        label: 'Name',
-                        width: 100,
-                      },
-                      {
-                        name: 'sma5',
-                        label: 'SMA-5',
-                        width: 100,
-                      },
-                      {
-                        name: 'sma10',
-                        label: 'SMA-10',
-                        width: 100,
-                      },
-                    ],
-                  },*/
-                  {
-                    type: 'chart',
-                    height: 800,
-                    config: {
-                      backgroundColor: '#fff',
-                      animation: true,
-                      animationDuration: 1000,
-                      tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                          type: 'cross',
-                        },
-                        backgroundColor: 'rgba(0, 0, 0, 0.7)',
-                        borderColor: '#333',
-                        borderWidth: 1,
-                        textStyle: {
-                          color: '#fff',
-                          fontSize: 12,
-                        },
-                        padding: 12,
-                        formatter: function (params) {
-                          const param = params[0]
-                          const open = param.data[1].toFixed(2)
-                          const close = param.data[2].toFixed(2)
-                          const lowest = param.data[3].toFixed(2)
-                          const highest = param.data[4].toFixed(2)
-          
-                          return `<div class="text-center font-bold mb-2">${param.name}</div>
-                                  <div class="text-center">
-                                    <span>开盘:</span>
-                                    <span class="font-bold ml-4">${open}</span>
-                                  </div>
-                                  <div class="text-center">
-                                    <span>收盘:</span>
-                                    <span class="font-bold ml-4">${close}</span>
-                                  </div>
-                                  <div class="text-center">
-                                    <span>最低:</span>
-                                    <span class="font-bold ml-4">${lowest}</span>
-                                  </div>
-                                  <div class="text-center">
-                                    <span>最高:</span>
-                                    <span class="font-bold ml-4">${highest}</span>
-                                  </div>`
-                        },
-                      },
-                      grid: {
-                        left: '2%',
-                        right: '2%',
-                        top: '5%',
-                        bottom: '12%',
-                        containLabel: true,
-                      },
-                      xAxis: {
-                        data: '${xList || []}',
-                        axisLine: {
-                          lineStyle: {
-                            color: '#e0e0e0',
-                          },
-                        },
-                        axisLabel: {
-                          color: '#666',
-                          fontWeight: 'bold',
-                        },
-                        splitLine: {
-                          show: false,
-                        },
-                        axisTick: {
-                          show: false,
-                        },
-                      },
-                      yAxis: {
-                        scale: true,
-                        axisLine: {
-                          lineStyle: {
-                            color: '#e0e0e0',
-                          },
-                        },
-                        axisLabel: {
-                          color: '#666',
-                          fontWeight: 'bold',
-                          formatter: function (value) {
-                            return value.toFixed(2)
-                          },
-                        },
-                        splitLine: {
-                          lineStyle: {
-                            type: 'dashed',
-                            color: '#f0f0f0',
-                          },
-                        },
-                        axisTick: {
-                          show: false,
-                        },
-                      },
-                      dataZoom: [
-                        {
-                          type: 'inside',
-                          start: 0,
-                          end: 100,
-                        },
-                        {
-                          show: true,
-                          type: 'slider',
-                          top: '90%',
-                          start: 0,
-                          end: 100,
-                        },
-                      ],
-                      series: [
-                        {
-                          type: 'candlestick',
-                          data: '${yList || []}',
-                          itemStyle: {
-                            color: '#eb5454',
-                            color0: '#4aaa93',
-                            borderColor: '#eb5454',
-                            borderColor0: '#4aaa93',
-                            borderWidth: 1,
-                          },
-                        },
-                        {
-                          type: 'line',
-                          data: '${sma10 || []}',
-                          smooth: true,
-                          lineStyle: {
-                            color: '#dcb38a',
-                          },
-                          symbol: 'none',
-                        },
-                        {
-                          type: 'line',
-                          data: '${sma60 || []}',
-                          smooth: true,
-                          lineStyle: {
-                            color: '#6ce3c6',
-                          },
-                          symbol: 'none',
-                        },
-                        {
-                          type: 'line',
-                          data: '${sma120 || []}',
-                          smooth: true,
-                          lineStyle: {
-                            color: '#6cd5e3',
-                          },
-                          symbol: 'none',
-                        },
-                      ],
-                    },
-                  },
-                ],
-              }
-              amis.embed('#root', amisJson, {}, {theme: 'antd'})
-            })()
-          </script>
-          </html>
-          """,
-        mapper.writeValueAsString(data)
-      )
-    );
+            }
+            return 0;
+          },
+          startDate,
+          endDate
+        );
+        var sources = dailyRepository.findAll(
+          QDaily.daily.stock.code.eq(code)
+            .and(QDaily.daily.tradeDate.after(startDate.minusDays(150)))
+            .and(QDaily.daily.tradeDate.before(endDate)),
+          QDaily.daily.tradeDate.asc()
+        );
+
+        var dailies = sources.stream()
+          .filter(daily -> daily.getTradeDate().isAfter(startDate) && daily.getTradeDate().isBefore(endDate))
+          .sorted(Comparator.comparing(Daily::getTradeDate))
+          .toList();
+        var oclhList = new HashMap<>();
+        var dailyCloseMapping = new HashMap<String, Double>();
+        for (var daily : dailies) {
+          oclhList.put(
+            daily.getTradeDate().toString(),
+            List.of(daily.getHfqOpen(), daily.getHfqClose(), daily.getHfqLow(), daily.getHfqHigh())
+          );
+          dailyCloseMapping.put(daily.getTradeDate().toString(), daily.getHfqClose());
+        }
+        charts.add(
+          Dict.create()
+            .set("title", code)
+            .set("type", "candle")
+            .set(
+              "data",
+              Dict.create()
+                .set(
+                  "日线",
+                  Dict.create()
+                    .set("type", "candle")
+                    .set("oclh", oclhList)
+                    .set(
+                      "points",
+                      asset.getTrades()
+                        .stream()
+                        .filter(trade -> trade.volume() != 0)
+                        .map(trade -> Dict.create()
+                          .set("value", trade.volume())
+                          .set("itemStyle", Dict.create()
+                            .set("color", trade.volume() > 0 ? "#e5b8b5" : "#b5e2e5")
+                          )
+                          .set("coord", List.of(trade.date().toString(), dailyCloseMapping.getOrDefault(trade.date().toString(), 0.0)))
+                        )
+                        .toList()
+                    )
+                )
+                .set(
+                  "资金",
+                  Dict.create()
+                    .set("type", "line")
+                )
+            )
+        );
+        /*log.info("Final Cash: {}", asset.getCash());
+        for (var history : asset.getHistories()) {
+          log.info("Date: {} Cash: {} Trade: {}", history.date(), history.cash(), history.trades().values());
+        }*/
+      });
+    var template = engine.getTemplate("backtest_report.html");
+    Files.writeString(Path.of("backtest_report.html"), template.render(
+      Dict.create().set("charts", charts)
+    ));
   }
 
   @Transactional(readOnly = true)
   @EventListener(ApplicationReadyEvent.class)
-  public void test() {
-    /*var dailies = dailyRepository.findAll(
-      QDaily.daily.tradeDate.year().eq(2025),
-      Sort.by(Daily_.TRADE_DATE)
-    );
-    var data = dailies.stream()
-      .collect(Collectors.groupingBy(Daily::getStock))
-      .entrySet()
+  public void test() throws IOException {
+    var dailyRange = 150;
+    var weekRange = 24;
+    var monthRange = 12;
+    var charts = Dict.create();
+    List.of("000048.SZ", "000333.SZ", "000568.SZ", "000596.SZ", "000651.SZ", "000848.SZ"/*, "000858.SZ", "000933.SZ", "002027.SZ", "002032.SZ", "002142.SZ", "002192.SZ", "002415.SZ", "002432.SZ", "002475.SZ", "002517.SZ", "002555.SZ", "002648.SZ", "002756.SZ", "002847.SZ", "600036.SH", "600096.SH", "600132.SH", "600188.SH", "600309.SH", "600426.SH", "600436.SH", "600519.SH", "600546.SH", "600563.SH", "600702.SH", "600779.SH", "600803.SH", "600809.SH", "600961.SH", "601001.SH", "601100.SH", "601138.SH", "601225.SH", "601899.SH", "601919.SH", "603195.SH", "603198.SH", "603288.SH", "603369.SH", "603444.SH", "603565.SH", "603568.SH", "603605.SH", "603688.SH"*/)
       .parallelStream()
-      .map(entry -> {
-        var stock = entry.getKey();
-        var dailyList = entry.getValue()
-          .stream()
+      .forEach(code -> {
+        var sources = dailyRepository.findAll(
+          QDaily.daily.stock.code.eq(code)
+            .and(QDaily.daily.tradeDate.after(LocalDate.now().minusMonths(12))),
+          QDaily.daily.tradeDate.asc()
+        );
+
+        var dailies = sources.stream()
+          .filter(daily -> daily.getTradeDate().isAfter(LocalDate.now().minusDays(dailyRange)))
           .sorted(Comparator.comparing(Daily::getTradeDate))
           .toList();
-        var statistics = new DescriptiveStatistics();
-        dailyList.stream().map(Daily::getHfqClose).forEach(statistics::addValue);
-        var barSeries = new BaseBarSeriesBuilder().build();
-        dailyList.forEach(daily -> barSeries.addBar(new BaseBar(
-          Duration.ofDays(1),
-          daily.getTradeDate().atStartOfDay().atZone(ZoneId.systemDefault()),
-          daily.getHfqOpen(),
-          daily.getHfqHigh(),
-          daily.getHfqLow(),
-          daily.getHfqClose(),
-          daily.getVolume()
-        )));
-        return Map.<String, String>of(
-          "code", stock.getCode(),
-          "name", stock.getName(),
-          "std", NumberUtil.roundStr(statistics.getStandardDeviation(), 2),
-          "increase", NumberUtil.roundStr((dailyList.getLast().getHfqClose() - dailyList.getFirst().getHfqClose()) * 100.0 / dailyList.getFirst().getHfqClose(), 2)
-        );
-      })
-      .sorted((t1, t2) -> Double.compare(Double.parseDouble(t2.get("increase")), Double.parseDouble(t1.get("increase"))))
-      .toList();
-    render(Map.of("items", data));*/
+        var dailyXList = new ArrayList<String>();
+        var dailyYList = new ArrayList<List<Double>>();
+        for (var daily : dailies) {
+          dailyXList.add(daily.getTradeDate().toString());
+          dailyYList.add(List.of(daily.getHfqOpen(), daily.getHfqClose(), daily.getHfqLow(), daily.getHfqHigh()));
+        }
 
-    var lines = new ArrayList<String>();
-    for (int year = 2024; year < 2025; year++) {
-      var candidates = pyramidStockSelector.select(new PyramidStockSelector.Request(year));
-      for (StockSelector.Candidate candidate : candidates) {
-        log.info("{} {}", candidate.stock().getName(), candidate.score());
-      }
-      var stocks = candidates.stream()
-        .map(StockSelector.Candidate::stock)
-        .collect(Collectors.toSet());
-      var results = assessmentService.assess(stocks, year);
-      int up = results.stream()
-        .filter(result -> result.change() > 0)
-        .mapToInt(result -> 1)
-        .sum();
-      lines.add(NumberUtil.roundStr(up * 100.0 / results.size(), 2));
-      results.forEach(result -> log.info("{} {} {} {} {}", result.stock().getCode(), result.stock().getName(), result.change(), result.std(), result.industryTop()));
-    }
-    for (int index = 0, year = 2010; index < lines.size(); index++, year++) {
-      log.info("胜率: {} {}", year, lines.get(index));
-    }
+        // 30日均线和均线斜率
+        var sma30 = TaHelper.sma(sources, 30, Daily::getHfqClose).subList(sources.size() - dailyRange, sources.size());
+        /*var slopes = new ArrayList<Double>();
+        slopes.add(0.0);
+        for (int i = 1; i < sma30.size(); i++) {
+          slopes.add(((sma30.get(i) - sma30.get(i - 1)) * 1000.0) / sma30.get(i - 1));
+        }*/
+        var sma60 = TaHelper.sma(sources, 60, Daily::getHfqClose).subList(sources.size() - dailyRange, sources.size());
+
+        charts.set(
+          StrUtil.format("日线 {}", code),
+          Dict.create()
+            .set("xList", dailyXList)
+            .set("yList", dailyYList)
+            .set("sma30", sma30)
+            .set("sma60", sma60)
+          // .set("sma30Slopes", slopes)
+        );
+
+        var weeklies = sources.stream()
+          .filter(daily -> daily.getTradeDate().isAfter(LocalDate.now().minusWeeks(weekRange)))
+          .collect(Collectors.groupingBy(daily -> new YearAndWeek(daily.getTradeDate().getYear(), daily.getTradeDate().get(WeekFields.ISO.weekOfYear()))))
+          .entrySet()
+          .stream()
+          .map(entry -> {
+            var yearAndWeek = entry.getKey();
+            var subDailies = entry.getValue();
+            var open = subDailies.getFirst().getHfqOpen();
+            var close = subDailies.getLast().getHfqClose();
+            return new Weekly(
+              LocalDate.of(yearAndWeek.year(), 1, 1).with(WeekFields.ISO.weekOfYear(), yearAndWeek.week()),
+              yearAndWeek.year(),
+              yearAndWeek.week(),
+              open,
+              maxFromDaily(subDailies, Daily::getHfqHigh),
+              minFromDaily(subDailies, Daily::getHfqLow),
+              close,
+              close - open,
+              (close - open) / open * 100,
+              sumFromDaily(subDailies, Daily::getVolume),
+              sumFromDaily(subDailies, Daily::getTurnover)
+            );
+          })
+          .sorted(Comparator.comparingInt(weekly -> weekly.year() * 100 + weekly.week()))
+          .toList();
+
+        var weekXList = new ArrayList<String>();
+        var weekYList = new ArrayList<List<Double>>();
+        for (var weekly : weeklies) {
+          weekXList.add(weekly.tradeDate().toString());
+          weekYList.add(List.of(weekly.open(), weekly.close(), weekly.low(), weekly.high()));
+        }
+
+        charts.set(
+          StrUtil.format("周线 {}", code),
+          Dict.create()
+            .set("xList", weekXList)
+            .set("yList", weekYList)
+        );
+
+        var monthlies = sources.stream()
+          .filter(daily -> daily.getTradeDate().isAfter(LocalDate.now().minusMonths(monthRange)))
+          .collect(Collectors.groupingBy(daily -> new YearAndMonth(daily.getTradeDate().getYear(), daily.getTradeDate().getMonthValue())))
+          .entrySet()
+          .stream()
+          .map(entry -> {
+            var yearAndMonth = entry.getKey();
+            var subDailies = entry.getValue();
+            var open = subDailies.getFirst().getHfqOpen();
+            var close = subDailies.getLast().getHfqClose();
+            return new Monthly(
+              LocalDate.of(yearAndMonth.year(), yearAndMonth.month(), 1),
+              yearAndMonth.year(),
+              yearAndMonth.month(),
+              open,
+              maxFromDaily(subDailies, Daily::getHfqHigh),
+              minFromDaily(subDailies, Daily::getHfqLow),
+              close,
+              close - open,
+              (close - open) / open * 100,
+              sumFromDaily(subDailies, Daily::getVolume),
+              sumFromDaily(subDailies, Daily::getTurnover)
+            );
+          })
+          .sorted(Comparator.comparingInt(monthly -> monthly.year() * 100 + monthly.month()))
+          .toList();
+
+        var monthXList = new ArrayList<String>();
+        var monthYList = new ArrayList<List<Double>>();
+        for (var month : monthlies) {
+          monthXList.add(month.tradeDate().toString());
+          monthYList.add(List.of(month.open(), month.close(), month.low(), month.high()));
+        }
+
+        charts.set(
+          StrUtil.format("月线 {}", code),
+          Dict.create()
+            .set("xList", monthXList)
+            .set("yList", monthYList)
+        );
+      });
+
+    var template = engine.getTemplate("report.html");
+    Files.writeString(Path.of("report.html"), template.render(
+      Dict.create().set("charts", charts)
+    ));
   }
 }

leopard-strategy/src/main/resources/logback-spring.xml

@@ -15,7 +15,7 @@
     </appender>
 
     <logger name="com.lanyuanxiaoyao.leopard" level="INFO"/>
-    <!--<logger name="org.hibernate.SQL" level="DEBUG"/>-->
+    <logger name="org.hibernate.SQL" level="DEBUG"/>
 
     <root level="ERROR">
         <appender-ref ref="Console"/>

leopard-strategy/src/main/resources/templates/backtest_report.html

@@ -0,0 +1,391 @@
+<html lang='zh'>
+<head>
+  <meta charset='utf-8'/>
+  <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+  <meta content='width=device-width, initial-scale=1.0' name='viewport'/>
+  <title>Strategy</title>
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/antd.min.css" rel="stylesheet"/>
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/helper.min.css" rel="stylesheet"/>
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/iconfont.min.css" rel="stylesheet"/>
+  <style>
+    html, body, #root {
+      position: relative;
+      width: 100%;
+      height: 100%;
+      margin: 0;
+      padding: 0;
+    }
+  </style>
+</head>
+<body>
+<div id='root'></div>
+</body>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/sdk.min.js"></script>
+<script th:inline="javascript" type='text/javascript'>
+  // 全局配置（颜色、尺寸、间距等），集中管理，便于统一调整
+  const CONFIG = {
+    colors: {up: '#000000FF', down: '#00000045'},
+    grid: {left: '2%', right: '2%', top: 40, bottom: 110},
+    zoom: {bottom: 16, height: 50},
+    linewidth: {stem: 1.5, openTick: 1.2, closeTick: 1.6, closeLine: 1.5},
+    tick: {min: 4, max: 10, scale: 0.4},
+  }
+
+  // 通用 tooltip 格式化（按索引回读原始 O/H/L/C）
+  function makeTooltipFormatter(dataMap, dates) {
+    return function (params) {
+      let p = Array.isArray(params) ? params[0] : params
+      let idx = p.dataIndex
+      let d = dates[idx]
+      let ohlc = dataMap[d] || []
+      let o = ohlc[0], c = ohlc[1], l = ohlc[2], h = ohlc[3]
+      let chg = (c - o)
+      let chgPct = o ? (chg / o * 100) : 0
+      let sign = chg >= 0 ? '+' : ''
+      return [
+        d,
+        'O: ' + o,
+        'C: ' + c,
+        'H: ' + h,
+        'L: ' + l,
+        'Chg: ' + sign + chg.toFixed(2) + ' (' + sign + chgPct.toFixed(2) + '%)',
+      ].join('<br/>')
+    }
+  }
+
+  // 通用基础配置构建（legend/tooltip/grid/xAxis/yAxis/dataZoom）
+  function buildBaseOption(dates, series, formatter) {
+    return {
+      animation: false,
+      legend: {show: false},
+      tooltip: {trigger: 'axis', axisPointer: {type: 'cross'}, formatter},
+      grid: CONFIG.grid,
+      xAxis: {type: 'category', data: dates, boundaryGap: true, axisLine: {onZero: false}},
+      yAxis: {scale: true},
+      dataZoom: [
+        {type: 'inside', xAxisIndex: 0, start: 0, end: 100},
+        {
+          show: true,
+          type: 'slider',
+          xAxisIndex: 0,
+          bottom: CONFIG.zoom.bottom,
+          height: CONFIG.zoom.height,
+          start: 0,
+          end: 100,
+        },
+      ],
+      series,
+    }
+  }
+
+  // Range Band + Close Line（高低区间带 + 收盘线）：趋势与波动范围直观
+  function buildRangeCloseOption(dataMap) {
+    const dates = Object.keys(dataMap).sort()
+    const lowArr = dates.map(d => dataMap[d][2])
+    const highArr = dates.map(d => dataMap[d][3])
+    const closeArr = dates.map(d => dataMap[d][1])
+    const rangeArr = highArr.map((h, i) => h - lowArr[i])
+
+    const series = [
+      {
+        name: 'Low',
+        type: 'line',
+        data: lowArr,
+        stack: 'range',
+        symbol: 'none',
+        lineStyle: {width: 0},
+        emphasis: {disabled: true},
+      },
+      {
+        name: 'Range',
+        type: 'line',
+        data: rangeArr,
+        stack: 'range',
+        symbol: 'none',
+        lineStyle: {width: 0},
+        areaStyle: {color: CONFIG.colors.down, opacity: 0.6},
+        z: 2,
+      },
+      {
+        name: 'Close',
+        type: 'line',
+        data: closeArr,
+        symbol: 'none',
+        lineStyle: {color: CONFIG.colors.up, width: CONFIG.linewidth.closeLine},
+        z: 3,
+      },
+    ]
+
+    return buildBaseOption(dates, series, makeTooltipFormatter(dataMap, dates))
+  }
+
+  // Minimal OHLC（竖线 + 左/右短横）：信息等价于K线但形态简洁
+  function buildOHLCMinimalOption(dataMap) {
+    const dates = Object.keys(dataMap).sort()
+    const ohlcData = dates.map((d, i) => [i, ...dataMap[d]])
+
+    // 自定义渲染：竖线=高低区间；左短横=开盘；右短横=收盘；颜色=涨跌
+    function renderOHLCMinimal(params, api) {
+      let idx = api.value(0)
+      let open = api.value(1)
+      let close = api.value(2)
+      let low = api.value(3)
+      let high = api.value(4)
+      let up = close >= open
+
+      let x = api.coord([idx, 0])[0]
+      let highPoint = api.coord([idx, high])
+      let lowPoint = api.coord([idx, low])
+      let openPoint = api.coord([idx, open])
+      let closePoint = api.coord([idx, close])
+
+      let band = api.size([1, 0])[0]
+      let tick = Math.max(CONFIG.tick.min, Math.min(CONFIG.tick.max, band * CONFIG.tick.scale))
+      let color = up ? CONFIG.colors.up : CONFIG.colors.down
+
+      return {
+        type: 'group',
+        children: [
+          {
+            type: 'line',
+            shape: {x1: x, y1: highPoint[1], x2: x, y2: lowPoint[1]},
+            style: {stroke: color, lineWidth: CONFIG.linewidth.stem, opacity: 0.9},
+          },
+          {
+            type: 'line',
+            shape: {x1: x - tick, y1: openPoint[1], x2: x, y2: openPoint[1]},
+            style: {stroke: color, lineWidth: CONFIG.linewidth.openTick, opacity: 0.95},
+          },
+          {
+            type: 'line',
+            shape: {x1: x, y1: closePoint[1], x2: x + tick, y2: closePoint[1]},
+            style: {stroke: color, lineWidth: CONFIG.linewidth.closeTick, opacity: 0.95},
+          },
+        ],
+      }
+    }
+
+    const series = [
+      {
+        name: 'ohlc',
+        type: 'custom',
+        renderItem: renderOHLCMinimal,
+        encode: {x: 0, y: [1, 2, 3, 4]},
+        data: ohlcData,
+        z: 10,
+      },
+    ]
+
+    return buildBaseOption(dates, series, makeTooltipFormatter(dataMap, dates))
+  }
+
+  function candleChart(title, data) {
+    return {
+      type: 'service',
+      data: data,
+      body: {
+        className: 'mt-2',
+        type: 'chart',
+        height: 800,
+        config: {
+          title: {
+            text: title,
+          },
+          ...buildRangeCloseOption(data['oclh']),
+        },
+      },
+    }
+  }
+
+  function lineChart(title, data) {
+    return {
+      type: 'service',
+      data: data,
+      body: {
+        className: 'mt-2',
+        type: 'chart',
+        height: 800,
+        config: {
+          title: {
+            text: title,
+          },
+          backgroundColor: '#fff',
+          animation: true,
+          animationDuration: 1000,
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'cross',
+            },
+            backgroundColor: 'rgba(0, 0, 0, 0.7)',
+            borderColor: '#333',
+            borderWidth: 1,
+            textStyle: {
+              color: '#fff',
+              fontSize: 12,
+            },
+            padding: 12,
+          },
+          grid: {
+            left: '2%',
+            right: '2%',
+            top: '15%',
+            bottom: '15%',
+            containLabel: true,
+          },
+          xAxis: {
+            data: '${xList || []}',
+            axisLine: {
+              lineStyle: {
+                color: '#e0e0e0',
+              },
+            },
+            axisLabel: {
+              color: '#666',
+              fontWeight: 'bold',
+            },
+            splitLine: {
+              show: false,
+            },
+            axisTick: {
+              show: false,
+            },
+          },
+          yAxis: [
+            {
+              position: 'left',
+              scale: true,
+              axisLine: {
+                lineStyle: {
+                  color: '#e0e0e0',
+                },
+              },
+              axisLabel: {
+                color: '#666',
+                fontWeight: 'bold',
+                formatter: function (value) {
+                  return value.toFixed(2)
+                },
+              },
+              splitLine: {
+                lineStyle: {
+                  type: 'dashed',
+                  color: '#f0f0f0',
+                },
+              },
+              axisTick: {
+                show: false,
+              },
+            },
+            {
+              position: 'right',
+              scale: true,
+              axisLine: {
+                lineStyle: {
+                  color: '#e0e0e0',
+                },
+              },
+              axisLabel: {
+                color: '#666',
+                fontWeight: 'bold',
+                formatter: function (value) {
+                  return value.toFixed(2)
+                },
+              },
+              splitLine: {
+                lineStyle: {
+                  type: 'dashed',
+                  color: '#f0f0f0',
+                },
+              },
+              axisTick: {
+                show: false,
+              },
+            },
+            {
+              scale: true,
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              axisLabel: {
+                show: false,
+              },
+              splitLine: {
+                show: false,
+              },
+            },
+          ],
+          dataZoom: [
+            {
+              type: 'inside',
+              start: 0,
+              end: 100,
+            },
+            {
+              show: true,
+              type: 'slider',
+              top: '90%',
+              start: 0,
+              end: 100,
+            },
+          ],
+          series: [
+            {
+              type: 'line',
+              yAxisIndex: 0,
+              data: '${yList || []}',
+              smooth: true,
+              symbol: 'none',
+              lineStyle: {
+                color: 'rgba(0,111,255,0.5)',
+              },
+            },
+          ],
+        },
+      },
+    }
+  }
+
+  const data = /*[[${charts}]]*/ [];
+
+  (function () {
+    const amis = amisRequire('amis/embed')
+    const amisJson = {
+      type: 'page',
+      title: 'Strategy',
+      body: {
+        type: 'tabs',
+        tabsMode: 'vertical',
+        tabs: data.map(item => {
+          let body = {}
+          if (item?.type === 'candle') {
+            body = Object.keys(item?.data ?? {})
+              .map(key => candleChart(key, item.data[key]))
+          }
+          return {
+            title: item?.title,
+            body: Object.keys(item?.data ?? {})
+              .map(key => {
+                let value = item.data[key]
+                let type = value['type']
+                if (type) {
+                  if (type === 'candle')
+                    return candleChart(key, item.data[key])
+                  else if (type === 'line')
+                    return lineChart(key, item.data[key])
+                } else {
+                  return null
+                }
+              })
+              .filter(item => item),
+          }
+        }),
+      },
+    }
+    amis.embed('#root', amisJson, {}, {theme: 'antd'})
+  })()
+</script>
+</html>

leopard-strategy/src/main/resources/templates/report.html

@@ -0,0 +1,228 @@
+<html lang='zh'>
+<head>
+  <meta charset='utf-8'/>
+  <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+  <meta content='width=device-width, initial-scale=1.0' name='viewport'/>
+  <title>Strategy</title>
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/antd.min.css" rel="stylesheet"/>
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/helper.min.css" rel="stylesheet"/>
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/iconfont.min.css" rel="stylesheet"/>
+  <style>
+    html, body, #root {
+      position: relative;
+      width: 100%;
+      height: 100%;
+      margin: 0;
+      padding: 0;
+    }
+  </style>
+</head>
+<body>
+<div id='root'></div>
+</body>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/amis/6.13.0/sdk.min.js"></script>
+<script th:inline="javascript" type='text/javascript'>
+  // Market data as KV: { 'YYYY-MM-DD': [open, close, low, high], ... }
+  const data = {
+    '2025-01-01': [100, 105, 98, 108],
+    '2025-01-02': [105, 102, 100, 107],
+    '2025-01-03': [102, 110, 101, 112],
+    '2025-01-04': [110, 108, 106, 113],
+    '2025-01-05': [108, 115, 107, 116],
+    '2025-01-06': [115, 117, 114, 120],
+    '2025-01-07': [117, 112, 111, 119],
+    '2025-01-08': [112, 118, 110, 121],
+    '2025-01-09': [118, 121, 117, 123],
+    '2025-01-10': [121, 119, 118, 122],
+  }
+
+  // 全局配置（颜色、尺寸、间距等），集中管理，便于统一调整
+  const CONFIG = {
+    colors: {up: '#000000FF', down: '#00000045'},
+    grid: {left: '2%', right: '2%', top: 40, bottom: 110},
+    zoom: {bottom: 16, height: 50},
+    linewidth: {stem: 1.5, openTick: 1.2, closeTick: 1.6, closeLine: 1.5},
+    tick: {min: 4, max: 10, scale: 0.4},
+  }
+
+  // 通用 tooltip 格式化（按索引回读原始 O/H/L/C）
+  function makeTooltipFormatter(dataMap, dates) {
+    return function (params) {
+      let p = Array.isArray(params) ? params[0] : params
+      let idx = p.dataIndex
+      let d = dates[idx]
+      let ohlc = dataMap[d] || []
+      let o = ohlc[0], c = ohlc[1], l = ohlc[2], h = ohlc[3]
+      let chg = (c - o)
+      let chgPct = o ? (chg / o * 100) : 0
+      let sign = chg >= 0 ? '+' : ''
+      return [
+        d,
+        'O: ' + o,
+        'C: ' + c,
+        'H: ' + h,
+        'L: ' + l,
+        'Chg: ' + sign + chg.toFixed(2) + ' (' + sign + chgPct.toFixed(2) + '%)',
+      ].join('<br/>')
+    }
+  }
+
+  // 通用基础配置构建（legend/tooltip/grid/xAxis/yAxis/dataZoom）
+  function buildBaseOption(dates, series, formatter) {
+    return {
+      animation: false,
+      legend: {show: false},
+      tooltip: {trigger: 'axis', axisPointer: {type: 'cross'}, formatter},
+      grid: CONFIG.grid,
+      xAxis: {type: 'category', data: dates, boundaryGap: true, axisLine: {onZero: false}},
+      yAxis: {scale: true},
+      dataZoom: [
+        {type: 'inside', xAxisIndex: 0, start: 0, end: 100},
+        {
+          show: true,
+          type: 'slider',
+          xAxisIndex: 0,
+          bottom: CONFIG.zoom.bottom,
+          height: CONFIG.zoom.height,
+          start: 0,
+          end: 100,
+        },
+      ],
+      series,
+    }
+  }
+
+  // Range Band + Close Line（高低区间带 + 收盘线）：趋势与波动范围直观
+  function buildRangeCloseOption(dataMap) {
+    const dates = Object.keys(dataMap).sort()
+    const lowArr = dates.map(d => dataMap[d][2])
+    const highArr = dates.map(d => dataMap[d][3])
+    const closeArr = dates.map(d => dataMap[d][1])
+    const rangeArr = highArr.map((h, i) => h - lowArr[i])
+
+    const series = [
+      {
+        name: 'Low',
+        type: 'line',
+        data: lowArr,
+        stack: 'range',
+        symbol: 'none',
+        lineStyle: {width: 0},
+        emphasis: {disabled: true},
+      },
+      {
+        name: 'Range',
+        type: 'line',
+        data: rangeArr,
+        stack: 'range',
+        symbol: 'none',
+        lineStyle: {width: 0},
+        areaStyle: {color: CONFIG.colors.down, opacity: 0.6},
+        z: 2,
+      },
+      {
+        name: 'Close',
+        type: 'line',
+        data: closeArr,
+        symbol: 'none',
+        lineStyle: {color: CONFIG.colors.up, width: CONFIG.linewidth.closeLine},
+        z: 3,
+      },
+    ]
+
+    return buildBaseOption(dates, series, makeTooltipFormatter(dataMap, dates))
+  }
+
+  // Minimal OHLC（竖线 + 左/右短横）：信息等价于K线但形态简洁
+  function buildOHLCMinimalOption(dataMap) {
+    const dates = Object.keys(dataMap).sort()
+    const ohlcData = dates.map((d, i) => [i, ...dataMap[d]])
+
+    // 自定义渲染：竖线=高低区间；左短横=开盘；右短横=收盘；颜色=涨跌
+    function renderOHLCMinimal(params, api) {
+      let idx = api.value(0)
+      let open = api.value(1)
+      let close = api.value(2)
+      let low = api.value(3)
+      let high = api.value(4)
+      let up = close >= open
+
+      let x = api.coord([idx, 0])[0]
+      let highPoint = api.coord([idx, high])
+      let lowPoint = api.coord([idx, low])
+      let openPoint = api.coord([idx, open])
+      let closePoint = api.coord([idx, close])
+
+      let band = api.size([1, 0])[0]
+      let tick = Math.max(CONFIG.tick.min, Math.min(CONFIG.tick.max, band * CONFIG.tick.scale))
+      let color = up ? CONFIG.colors.up : CONFIG.colors.down
+
+      return {
+        type: 'group',
+        children: [
+          {
+            type: 'line',
+            shape: {x1: x, y1: highPoint[1], x2: x, y2: lowPoint[1]},
+            style: {stroke: color, lineWidth: CONFIG.linewidth.stem, opacity: 0.9},
+          },
+          {
+            type: 'line',
+            shape: {x1: x - tick, y1: openPoint[1], x2: x, y2: openPoint[1]},
+            style: {stroke: color, lineWidth: CONFIG.linewidth.openTick, opacity: 0.95},
+          },
+          {
+            type: 'line',
+            shape: {x1: x, y1: closePoint[1], x2: x + tick, y2: closePoint[1]},
+            style: {stroke: color, lineWidth: CONFIG.linewidth.closeTick, opacity: 0.95},
+          },
+        ],
+      }
+    }
+
+    const series = [
+      {
+        name: 'ohlc',
+        type: 'custom',
+        renderItem: renderOHLCMinimal,
+        encode: {x: 0, y: [1, 2, 3, 4]},
+        data: ohlcData,
+        z: 10,
+      },
+    ]
+
+    return buildBaseOption(dates, series, makeTooltipFormatter(dataMap, dates))
+  }
+
+  (function () {
+    const amis = amisRequire('amis/embed')
+    const amisJson = {
+      type: 'page',
+      title: 'Strategy',
+      body: {
+        type: 'tabs',
+        tabsMode: 'vertical',
+        tabs: [
+          {
+            title: 'Charts',
+            // 在一个 Tab 中展示两张图，便于同屏对比
+            body: [
+              {
+                type: 'chart',
+                height: 500,
+                config: buildRangeCloseOption(data),
+              },
+              {
+                type: 'chart',
+                height: 500,
+                config: buildOHLCMinimalOption(data),
+              },
+            ],
+          },
+        ],
+      },
+    }
+    // `dates` 已直接在图表配置中使用，这里无需通过 amis data 传递
+    amis.embed('#root', amisJson, {}, {theme: 'antd'})
+  })()
+</script>
+</html>

leopard-web/src/index.tsx

@@ -6,7 +6,6 @@ import Overview from './pages/Overview.tsx'
 import Root from './pages/Root.tsx'
 import Test from './pages/Test.tsx'
 import StockList from './pages/stock/StockList.tsx'
-import StockDetail from './pages/stock/StockDetail.tsx'
 import TaskList from './pages/task/TaskList.tsx'
 import TaskTemplateList from './pages/task/TaskTemplateList.tsx'
 import TaskScheduleList from './pages/task/TaskScheduleList.tsx'
@@ -35,10 +34,6 @@ const routes: RouteObject[] = [
             path: 'list',
             Component: StockList,
           },
-          {
-            path: 'detail/:id',
-            Component: StockDetail,
-          },
           {
             path: "collection",
             children: [

leopard-web/src/pages/stock/StockCollectionDetail.tsx

@@ -1,9 +1,8 @@
 import React from "react"
 import {amisRender, commonInfo, crudCommonOptions, paginationTemplate, stockListColumns} from '../../util/amis.tsx'
-import {useNavigate, useParams} from 'react-router'
+import {useParams} from 'react-router'
 
 function StockCollectionDetail() {
-  const navigate = useNavigate()
   const {id} = useParams()
   return (
     <div className="stock-collection-detail">
@@ -15,13 +14,34 @@ function StockCollectionDetail() {
           body: [
             {
               type: 'crud',
-              source: '${stocks}',
+              source: '${scores}',
               ...crudCommonOptions(),
-              ...paginationTemplate(15, undefined, ['filter-toggler']),
-              columns: stockListColumns(navigate),
-            }
-          ]
-        }
+              ...paginationTemplate(100, undefined, ['filter-toggler']),
+              columns: stockListColumns(
+                undefined,
+                [
+                  {
+                    className: 'white-space-pre',
+                    name: 'score',
+                    label: '得分',
+                    width: 50,
+                    align: 'center',
+                    type: 'tpl',
+                    tpl: '${score}',
+                    popOver: {
+                      trigger: 'click',
+                      showIcon: false,
+                      body: {
+                        type: 'tpl',
+                        tpl: '${extra|raw}',
+                      },
+                    },
+                  },
+                ],
+              ),
+            },
+          ],
+        },
       )}
     </div>
   )

leopard-web/src/pages/stock/StockCollectionList.tsx

@@ -1,5 +1,5 @@
 import React from "react"
-import {amisRender, commonInfo, crudCommonOptions, paginationTemplate} from '../../util/amis.tsx'
+import {amisRender, commonInfo, crudCommonOptions, paginationTemplate, time} from '../../util/amis.tsx'
 import {useNavigate} from 'react-router'
 
 function StockCollectionList() {
@@ -14,8 +14,16 @@ function StockCollectionList() {
             {
               type: 'crud',
               api: {
-                method: 'get',
+                method: 'post',
                 url: `${commonInfo.baseUrl}/stock_collection/list`,
+                data: {
+                  sort: [
+                    {
+                      column: 'createdTime',
+                      direction: 'DESC',
+                    },
+                  ],
+                },
               },
               ...crudCommonOptions(),
               ...paginationTemplate(15, undefined, ['filter-toggler']),
@@ -35,6 +43,20 @@ function StockCollectionList() {
                   align: 'center',
                   width: 100,
                 },
+                {
+                  name: 'createdTime',
+                  label: '创建时间',
+                  width: 150,
+                  align: 'center',
+                  ...time('createdTime'),
+                },
+                {
+                  name: 'modifiedTime',
+                  label: '更新时间',
+                  width: 150,
+                  align: 'center',
+                  ...time('modifiedTime'),
+                },
                 {
                   type: 'operation',
                   label: '操作',
@@ -58,6 +80,16 @@ function StockCollectionList() {
                         },
                       },
                     },
+                    {
+                      className: 'text-danger btn-deleted',
+                      type: 'action',
+                      label: '删除',
+                      level: 'link',
+                      actionType: 'ajax',
+                      api: `get:${commonInfo.baseUrl}/stock_collection/remove/\${id}`,
+                      confirmText: '确认删除股票集<span class="text-lg font-bold mx-2">${name}</span>？',
+                      confirmTitle: '删除',
+                    },
                   ],
                 },
               ],

leopard-web/src/pages/stock/StockDetail.tsx

@@ -1,550 +0,0 @@
-import React from 'react'
-import {useParams} from 'react-router'
-import {amisRender, commonInfo, readOnlyDialogOptions, remoteMappings} from '../../util/amis.tsx'
-import type {Schema} from 'amis'
-import {isNil} from 'es-toolkit'
-import {toNumber} from 'es-toolkit/compat'
-
-const formatFinanceNumber = (value: number): string => {
-  if (isNil(value)) {
-    return '-'
-  }
-
-  const isNegative = value < 0
-  const absoluteValue = Math.abs(value)
-
-  let formatted: string
-  if (absoluteValue >= 100000000) {
-    formatted = (absoluteValue / 100000000).toFixed(2) + '亿'
-  } else if (absoluteValue >= 10000) {
-    formatted = (absoluteValue / 10000).toFixed(2) + '万'
-  } else {
-    formatted = absoluteValue.toLocaleString()
-  }
-
-  return isNegative ? `-${formatted}` : formatted
-}
-
-const formatDaysNumber = (value: number): string => {
-  if (isNil(value)) {
-    return '-'
-  }
-  return `${value.toFixed(0)}天`
-}
-
-const formatPercentageNumber = (value: number): string => {
-  if (isNil(value)) {
-    return '-'
-  }
-  return `${(value * 100).toFixed(2)}%`
-}
-
-type FinanceType = 'PERCENTAGE' | 'FINANCE' | 'DAYS'
-
-const financePropertyLabel = (id: string | undefined, label: string, type: FinanceType, field: string): Schema => {
-  if (!id) {
-    return {
-      type: 'tpl',
-      tpl: label,
-    }
-  }
-  let formatter: (value: number) => string
-  switch (type) {
-    case 'PERCENTAGE':
-      formatter = formatPercentageNumber
-      break
-    case 'FINANCE':
-      formatter = formatFinanceNumber
-      break
-    case 'DAYS':
-      formatter = formatDaysNumber
-      break
-    default:
-      formatter = (v: number) => v.toFixed(2)
-  }
-  return {
-    type: 'wrapper',
-    size: 'none',
-    body: [
-      {
-        className: 'text-current font-bold',
-        type: 'action',
-        label: label,
-        level: 'link',
-        tooltip: '这是什么？',
-        tooltipPlacement: 'top',
-        actionType: 'dialog',
-        dialog: {
-          title: '',
-          size: 'lg',
-          ...readOnlyDialogOptions(),
-          actions: [
-            {
-              type: 'action',
-              label: '新页面打开',
-              icon: 'fa fa-solid fa-arrow-up-right-from-square',
-              actionType: 'url',
-              url: `https://zh.wikipedia.org/wiki/${label}`,
-              blank: true,
-            },
-          ],
-          body: {
-            type: 'iframe',
-            src: `https://zh.wikipedia.org/wiki/${label}`,
-            height: 800,
-          },
-        },
-      },
-      {
-        className: 'text-secondary',
-        type: 'action',
-        label: '',
-        icon: 'fa fa-eye',
-        level: 'link',
-        size: 'xs',
-        tooltip: '查看五年趋势',
-        tooltipPlacement: 'top',
-        actionType: 'dialog',
-        dialog: {
-          title: `${label}五年趋势`,
-          size: 'lg',
-          bodyClassName: 'p-0',
-          ...readOnlyDialogOptions(),
-          body: {
-            type: 'chart',
-            api: `get:${commonInfo.baseUrl}/stock/finance/${id}/${field}`,
-            height: 500,
-            config: {
-              tooltip: {
-                trigger: 'axis',
-                backgroundColor: 'rgba(255, 255, 255, 0.9)',
-                borderColor: '#ccc',
-                borderWidth: 1,
-                textStyle: {
-                  color: '#333',
-                },
-                padding: [10, 15],
-                formatter: (params: any) => {
-                  const item = params[0]
-                  return `${item.name}<br/>${item.marker}${formatter(item.value)}`
-                },
-              },
-              grid: {
-                left: '5%',
-                right: '5%',
-                top: '10%',
-                bottom: '15%',
-                containLabel: true,
-              },
-              xAxis: {
-                type: 'category',
-                data: '${xList || []}',
-                axisLine: {
-                  lineStyle: {
-                    color: '#e0e0e0',
-                  },
-                },
-                axisLabel: {
-                  color: '#666',
-                  fontWeight: 'bold',
-                },
-                axisTick: {
-                  show: false,
-                },
-              },
-              yAxis: {
-                type: 'value',
-                show: true,
-                splitLine: {
-                  lineStyle: {
-                    type: 'dashed',
-                    color: '#f0f0f0',
-                  },
-                },
-                axisLine: {
-                  show: false,
-                },
-                axisLabel: {
-                  color: '#999',
-                  fontSize: 12,
-                  formatter: (value: number) => {
-                    return formatter(value)
-                  },
-                },
-                axisTick: {
-                  show: false,
-                },
-              },
-              series: [
-                {
-                  data: '${yList || []}',
-                  type: 'line',
-                  smooth: true,
-                  showSymbol: true,
-                  symbolSize: 6,
-                  lineStyle: {
-                    width: 3,
-                    color: '#4096ff',
-                    shadowColor: 'rgba(64, 150, 255, 0.3)',
-                    shadowBlur: 5,
-                    shadowOffsetY: 2,
-                  },
-                  itemStyle: {
-                    color: '#4096ff',
-                    borderWidth: 2,
-                    borderColor: '#fff',
-                  },
-                  areaStyle: {
-                    color: {
-                      type: 'linear',
-                      x: 0,
-                      y: 0,
-                      x2: 0,
-                      y2: 1,
-                      colorStops: [{
-                        offset: 0, color: 'rgba(64, 150, 255, 0.2)',
-                      }, {
-                        offset: 1, color: 'rgba(64, 150, 255, 0.01)',
-                      }],
-                    },
-                  },
-                  label: {
-                    show: true,
-                    position: 'top',
-                    color: '#333',
-                    fontWeight: 'bold',
-                    fontSize: 12,
-                    formatter: (params: any) => {
-                      return formatter(params.value)
-                    },
-                  },
-                },
-              ],
-            },
-          },
-        },
-      },
-    ],
-  }
-}
-
-function StockDetail() {
-  const {id} = useParams()
-  return (
-    <div className="stock-detail">
-      {amisRender(
-        {
-          type: 'page',
-          title: '股票详情（${code} ${name}）',
-          initApi: `get:${commonInfo.baseUrl}/stock/detail/${id}`,
-          body: [
-            {
-              type: 'property',
-              items: [
-                {label: '编码', content: '${code}'},
-                {label: '名称', content: '${name}'},
-                {label: '全名', content: '${fullname}'},
-                {
-                  label: '市场',
-                  content: {
-                    ...remoteMappings('stock_market', 'market'),
-                    value: '${market}',
-                  },
-                },
-                {label: '行业', content: '${industry}'},
-                {label: '上市日期', content: '${listedDate}'},
-              ],
-            },
-            {type: 'divider'},
-            {
-              type: 'service',
-              api: `get:${commonInfo.baseUrl}/stock/finance/${id}`,
-              body: [
-                '资产负债表',
-                {
-                  className: 'my-2',
-                  type: 'property',
-                  column: 4,
-                  items: [
-                    {
-                      label: financePropertyLabel(id, '总资产', 'FINANCE', 'totalAssets'),
-                      content: '${balanceSheet.totalAssets}',
-                      span: 2,
-                    },
-                    {
-                      label: financePropertyLabel(id, '总负债', 'FINANCE', 'totalLiabilities'),
-                      content: '${balanceSheet.totalLiabilities}',
-                      span: 2,
-                    },
-                    {
-                      label: financePropertyLabel(id, '流动资产', 'FINANCE', 'currentAssets'),
-                      content: '${balanceSheet.currentAssets}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '流动资产占比', 'PERCENTAGE', 'currentAssetsToTotalAssetsRatio'),
-                      content: '${balanceSheet.currentAssetsRatio}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '流动负债', 'FINANCE', 'currentLiabilities'),
-                      content: '${balanceSheet.currentLiabilities}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '流动负债占比', 'PERCENTAGE', 'currentLiabilitiesToTotalAssetsRatio'),
-                      content: '${balanceSheet.currentLiabilitiesRatio}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '非流动资产', 'FINANCE', 'fixedAssets'),
-                      content: '${balanceSheet.fixedAssets}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '非流动资产占比', 'PERCENTAGE', 'fixedAssetsToTotalAssetsRatio'),
-                      content: '${balanceSheet.fixedAssetsRatio}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '非流动负债', 'FINANCE', 'longTermLiabilities'),
-                      content: '${balanceSheet.longTermLiabilities}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '非流动负债占比', 'PERCENTAGE', 'longTermLiabilitiesToTotalAssetsRatio'),
-                      content: '${balanceSheet.longTermLiabilitiesRatio}',
-                    },
-                  ],
-                },
-                '利润表',
-                {
-                  className: 'my-2',
-                  type: 'property',
-                  items: [
-                    {
-                      label: financePropertyLabel(id, '营业收入', 'FINANCE', 'operatingRevenue'),
-                      content: '${income.operatingRevenue}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '营业成本', 'FINANCE', 'operatingCost'),
-                      content: '${income.operatingCost}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '营业利润', 'FINANCE', 'operatingProfit'),
-                      content: '${income.operatingProfit}',
-                    },
-                  ],
-                },
-                '现金流量表',
-                {
-                  className: 'my-2',
-                  type: 'property',
-                  items: [
-                    {
-                      label: financePropertyLabel(id, '净利润', 'FINANCE', 'netProfit'),
-                      content: '${cashFlow.netProfit}',
-                      span: 3,
-                    },
-                    {
-                      label: financePropertyLabel(id, '营业活动现金流量', 'FINANCE', 'cashFlowFromOperatingActivities'),
-                      content: '${cashFlow.cashFlowFromOperatingActivities}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '投资活动现金流量', 'FINANCE', 'cashFlowFromInvestingActivities'),
-                      content: '${cashFlow.cashFlowFromInvestingActivities}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '筹资活动现金流量', 'FINANCE', 'cashFlowFromFinancingActivities'),
-                      content: '${cashFlow.cashFlowFromFinancingActivities}',
-                    },
-                  ],
-                },
-                '财务指标',
-                {
-                  className: 'my-2',
-                  type: 'property',
-                  column: 4,
-                  items: [
-                    {
-                      label: financePropertyLabel(id, '流动比率', 'FINANCE', 'currentRatio'),
-                      content: '${indicate.currentRatio}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '速动比率', 'FINANCE', 'quickRatio'),
-                      content: '${indicate.quickRatio}',
-                    },
-                    {
-                      label: financePropertyLabel(id, 'ROE', 'FINANCE', 'returnOnEquity'),
-                      content: '${indicate.roe}',
-                    },
-                    {
-                      label: financePropertyLabel(id, 'ROA', 'FINANCE', 'returnOnAssets'),
-                      content: '${indicate.roa}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '应收账款周转率', 'FINANCE', 'accountsReceivableTurnover'),
-                      content: '${indicate.accountsReceivableTurnover}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '应收账款周转天数', 'DAYS', 'daysAccountsReceivableTurnover'),
-                      content: '${indicate.daysAccountsReceivableTurnover}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '存货周转率', 'FINANCE', 'inventoryTurnover'),
-                      content: '${indicate.inventoryTurnover}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '存货周转天数', 'DAYS', 'daysInventoryTurnover'),
-                      content: '${indicate.daysInventoryTurnover}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '固定资产周转率', 'FINANCE', 'fixedAssetsTurnover'),
-                      content: '${indicate.fixedAssetsTurnover}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '固定资产周转天数', 'DAYS', 'daysFixedAssetsTurnover'),
-                      content: '${indicate.daysFixedAssetsTurnover}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '总资产周转率', 'FINANCE', 'totalAssetsTurnover'),
-                      content: '${indicate.totalAssetsTurnover}',
-                    },
-                    {
-                      label: financePropertyLabel(id, '总资产周转天数', 'DAYS', 'daysTotalAssetsTurnover'),
-                      content: '${indicate.daysTotalAssetsTurnover}',
-                    },
-                  ],
-                },
-                {type: 'divider'},
-                "100日线数据",
-                {
-                  type: 'chart',
-                  height: 500,
-                  api: `get:${commonInfo.baseUrl}/stock/daily/${id}`,
-                  config: {
-                    backgroundColor: '#fff',
-                    animation: true,
-                    animationDuration: 1000,
-                    tooltip: {
-                      trigger: 'axis',
-                      axisPointer: {
-                        type: 'cross',
-                      },
-                      backgroundColor: 'rgba(0, 0, 0, 0.7)',
-                      borderColor: '#333',
-                      borderWidth: 1,
-                      textStyle: {
-                        color: '#fff',
-                        fontSize: 12,
-                      },
-                      padding: 12,
-                      formatter: function (params: any) {
-                        const param = params[0]
-                        const open = toNumber(param.data[1]).toFixed(2)
-                        const close = toNumber(param.data[2]).toFixed(2)
-                        const lowest = toNumber(param.data[3]).toFixed(2)
-                        const highest = toNumber(param.data[4]).toFixed(2)
-
-                        return `<div class="text-center font-bold mb-2">${param.name}</div>
-                        <div class="text-center">
-                          <span>开盘:</span>
-                          <span class="font-bold ml-4">${open}</span>
-                        </div>
-                        <div class="text-center">
-                          <span>收盘:</span>
-                          <span class="font-bold ml-4">${close}</span>
-                        </div>
-                        <div class="text-center">
-                          <span>最低:</span>
-                          <span class="font-bold ml-4">${lowest}</span>
-                        </div>
-                        <div class="text-center">
-                          <span>最高:</span>
-                          <span class="font-bold ml-4">${highest}</span>
-                        </div>`
-                      },
-                    },
-                    grid: {
-                      left: '10%',
-                      right: '10%',
-                      top: '10%',
-                      bottom: '15%',
-                      containLabel: true,
-                    },
-                    xAxis: {
-                      data: '${xList || []}',
-                      axisLine: {
-                        lineStyle: {
-                          color: '#e0e0e0',
-                        },
-                      },
-                      axisLabel: {
-                        color: '#666',
-                        fontWeight: 'bold',
-                      },
-                      splitLine: {
-                        show: false,
-                      },
-                      axisTick: {
-                        show: false,
-                      },
-                    },
-                    yAxis: {
-                      scale: true,
-                      axisLine: {
-                        lineStyle: {
-                          color: '#e0e0e0',
-                        },
-                      },
-                      axisLabel: {
-                        color: '#666',
-                        fontWeight: 'bold',
-                        formatter: function (value: number) {
-                          return value.toFixed(2)
-                        },
-                      },
-                      splitLine: {
-                        lineStyle: {
-                          type: 'dashed',
-                          color: '#f0f0f0',
-                        },
-                      },
-                      axisTick: {
-                        show: false,
-                      },
-                    },
-                    dataZoom: [
-                      {
-                        type: 'inside',
-                        start: 0,
-                        end: 100,
-                      },
-                      {
-                        show: true,
-                        type: 'slider',
-                        top: '90%',
-                        start: 0,
-                        end: 100,
-                      },
-                    ],
-                    series: [
-                      {
-                        type: 'candlestick',
-                        data: '${yList || []}',
-                        itemStyle: {
-                          color: '#eb5454',
-                          color0: '#4aaa93',
-                          borderColor: '#eb5454',
-                          borderColor0: '#4aaa93',
-                          borderWidth: 1,
-                        },
-
-                      },
-                    ],
-                  },
-                },
-                "12月线数据",
-              ],
-            },
-          ],
-        },
-      )}
-    </div>
-  )
-}
-
-export default React.memo(StockDetail)

leopard-web/src/pages/stock/StockList.tsx

@@ -7,10 +7,8 @@ import {
   remoteOptions,
   stockListColumns,
 } from '../../util/amis.tsx'
-import {useNavigate} from 'react-router'
 
 function StockList() {
-  const navigate = useNavigate()
   return (
     <div className="stock-list">
       {amisRender(
@@ -96,7 +94,7 @@ function StockList() {
                   },
                 ],
               },
-              columns: stockListColumns(navigate),
+              columns: stockListColumns(),
             },
           ],
         },

leopard-web/src/pages/task/TaskDetail.tsx

@@ -28,7 +28,7 @@ function TaskDetail() {
                   label: '进度',
                   content: {
                     type: 'tpl',
-                    tpl: "${step}%",
+                    tpl: "${ROUND(step * 100, 2)}%",
                   },
                   span: 2,
                 },
@@ -56,9 +56,10 @@ function TaskDetail() {
                 },
                 {
                   visibleOn: 'result',
-                  type: 'editor',
+                  type: 'markdown-enhance',
                   name: 'result',
                   label: '结果',
+                  content: '${result}',
                 },
               ],
             },

leopard-web/src/util/amis.tsx

@@ -1,11 +1,13 @@
-import {AlertComponent, attachmentAdpator, makeTranslator, render, type Schema, ToastComponent} from 'amis'
+import {AlertComponent, type Api, attachmentAdpator, makeTranslator, render, type Schema, ToastComponent} from 'amis'
 import 'amis/lib/themes/antd.css'
 import 'amis/lib/helper.css'
 import 'amis/sdk/iconfont.css'
 import '@fortawesome/fontawesome-free/css/all.min.css'
 import axios from 'axios'
-import {isEqual} from 'es-toolkit'
-import type {NavigateFunction} from 'react-router'
+import {isEqual, isNil} from 'es-toolkit'
+// @ts-ignore
+import type {ColumnSchema} from 'amis/lib/renderers/Table2'
+import {toNumber} from 'es-toolkit/compat'
 
 export const commonInfo = {
   debug: isEqual(import.meta.env.MODE, 'development'),
@@ -336,7 +338,411 @@ export function remoteMappings(name: string, field: string) {
   }
 }
 
-export function stockListColumns(navigate: NavigateFunction) {
+const formatFinanceNumber = (value: number): string => {
+  if (isNil(value)) {
+    return '-'
+  }
+
+  const isNegative = value < 0
+  const absoluteValue = Math.abs(value)
+
+  let formatted: string
+  if (absoluteValue >= 100000000) {
+    formatted = (absoluteValue / 100000000).toFixed(2) + '亿'
+  } else if (absoluteValue >= 10000) {
+    formatted = (absoluteValue / 10000).toFixed(2) + '万'
+  } else {
+    formatted = absoluteValue.toLocaleString()
+  }
+
+  return isNegative ? `-${formatted}` : formatted
+}
+
+const formatDaysNumber = (value: number): string => {
+  if (isNil(value)) {
+    return '-'
+  }
+  return `${value.toFixed(0)}天`
+}
+
+const formatPercentageNumber = (value: number): string => {
+  if (isNil(value)) {
+    return '-'
+  }
+  return `${(value * 100).toFixed(2)}%`
+}
+
+type FinanceType = 'PERCENTAGE' | 'FINANCE' | 'DAYS'
+
+const financePropertyLabel = (idField: string, label: string, type: FinanceType, field: string): Schema => {
+  let formatter: (value: number) => string
+  switch (type) {
+    case 'PERCENTAGE':
+      formatter = formatPercentageNumber
+      break
+    case 'FINANCE':
+      formatter = formatFinanceNumber
+      break
+    case 'DAYS':
+      formatter = formatDaysNumber
+      break
+    default:
+      formatter = (v: number) => v.toFixed(2)
+  }
+  return {
+    type: 'wrapper',
+    size: 'none',
+    body: [
+      {
+        visibleOn: `\${!${idField}}`,
+        type: 'tpl',
+        tpl: label,
+      },
+      {
+        visibleOn: `\${${idField}}`,
+        className: 'text-current font-bold',
+        type: 'action',
+        label: label,
+        level: 'link',
+        tooltip: '这是什么？',
+        tooltipPlacement: 'top',
+        actionType: 'dialog',
+        dialog: {
+          title: '',
+          size: 'lg',
+          ...readOnlyDialogOptions(),
+          actions: [
+            {
+              type: 'action',
+              label: '新页面打开',
+              icon: 'fa fa-solid fa-arrow-up-right-from-square',
+              actionType: 'url',
+              url: `https://zh.wikipedia.org/wiki/${label}`,
+              blank: true,
+            },
+          ],
+          body: {
+            type: 'iframe',
+            src: `https://zh.wikipedia.org/wiki/${label}`,
+            height: 800,
+          },
+        },
+      },
+      {
+        className: 'text-secondary',
+        type: 'action',
+        label: '',
+        icon: 'fa fa-eye',
+        level: 'link',
+        size: 'xs',
+        tooltip: '查看五年趋势',
+        tooltipPlacement: 'top',
+        actionType: 'dialog',
+        dialog: {
+          title: `${label}五年趋势`,
+          size: 'lg',
+          bodyClassName: 'p-0',
+          ...readOnlyDialogOptions(),
+          body: {
+            type: 'chart',
+            api: `get:${commonInfo.baseUrl}/stock/finance/\${${idField}}/${field}`,
+            height: 500,
+            config: {
+              tooltip: {
+                trigger: 'axis',
+                backgroundColor: 'rgba(255, 255, 255, 0.9)',
+                borderColor: '#ccc',
+                borderWidth: 1,
+                textStyle: {
+                  color: '#333',
+                },
+                padding: [10, 15],
+                formatter: (params: any) => {
+                  const item = params[0]
+                  return `${item.name}<br/>${item.marker}${formatter(item.value)}`
+                },
+              },
+              grid: {
+                left: '5%',
+                right: '5%',
+                top: '10%',
+                bottom: '15%',
+                containLabel: true,
+              },
+              xAxis: {
+                type: 'category',
+                data: '${xList || []}',
+                axisLine: {
+                  lineStyle: {
+                    color: '#e0e0e0',
+                  },
+                },
+                axisLabel: {
+                  color: '#666',
+                  fontWeight: 'bold',
+                },
+                axisTick: {
+                  show: false,
+                },
+              },
+              yAxis: {
+                type: 'value',
+                show: true,
+                splitLine: {
+                  lineStyle: {
+                    type: 'dashed',
+                    color: '#f0f0f0',
+                  },
+                },
+                axisLine: {
+                  show: false,
+                },
+                axisLabel: {
+                  color: '#999',
+                  fontSize: 12,
+                  formatter: (value: number) => {
+                    return formatter(value)
+                  },
+                },
+                axisTick: {
+                  show: false,
+                },
+              },
+              series: [
+                {
+                  data: '${yList || []}',
+                  type: 'line',
+                  smooth: true,
+                  showSymbol: true,
+                  symbolSize: 6,
+                  lineStyle: {
+                    width: 3,
+                    color: '#4096ff',
+                    shadowColor: 'rgba(64, 150, 255, 0.3)',
+                    shadowBlur: 5,
+                    shadowOffsetY: 2,
+                  },
+                  itemStyle: {
+                    color: '#4096ff',
+                    borderWidth: 2,
+                    borderColor: '#fff',
+                  },
+                  areaStyle: {
+                    color: {
+                      type: 'linear',
+                      x: 0,
+                      y: 0,
+                      x2: 0,
+                      y2: 1,
+                      colorStops: [{
+                        offset: 0, color: 'rgba(64, 150, 255, 0.2)',
+                      }, {
+                        offset: 1, color: 'rgba(64, 150, 255, 0.01)',
+                      }],
+                    },
+                  },
+                  label: {
+                    show: true,
+                    position: 'top',
+                    color: '#333',
+                    fontWeight: 'bold',
+                    fontSize: 12,
+                    formatter: (params: any) => {
+                      return formatter(params.value)
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+    ],
+  }
+}
+
+const candleChart = (title: string, subtitle: string, api: Api): Schema => {
+  return {
+    className: 'mt-2',
+    type: 'chart',
+    height: 500,
+    api: api,
+    config: {
+      title: {
+        text: title,
+        subtext: subtitle,
+      },
+      backgroundColor: '#fff',
+      animation: true,
+      animationDuration: 1000,
+      tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+          type: 'cross',
+        },
+        backgroundColor: 'rgba(0, 0, 0, 0.7)',
+        borderColor: '#333',
+        borderWidth: 1,
+        textStyle: {
+          color: '#fff',
+          fontSize: 12,
+        },
+        padding: 12,
+        formatter: function (params: any) {
+          const param = params[0]
+          const open = toNumber(param.data[1]).toFixed(2)
+          const close = toNumber(param.data[2]).toFixed(2)
+          const lowest = toNumber(param.data[3]).toFixed(2)
+          const highest = toNumber(param.data[4]).toFixed(2)
+
+          return `<div class="text-center font-bold mb-2">${param.name}</div>
+                        <div class="text-center">
+                          <span>开盘:</span>
+                          <span class="font-bold ml-4">${open}</span>
+                        </div>
+                        <div class="text-center">
+                          <span>收盘:</span>
+                          <span class="font-bold ml-4">${close}</span>
+                        </div>
+                        <div class="text-center">
+                          <span>最低:</span>
+                          <span class="font-bold ml-4">${lowest}</span>
+                        </div>
+                        <div class="text-center">
+                          <span>最高:</span>
+                          <span class="font-bold ml-4">${highest}</span>
+                        </div>`
+        },
+      },
+      grid: {
+        left: '2%',
+        right: '2%',
+        top: '15%',
+        bottom: '15%',
+        containLabel: true,
+      },
+      xAxis: {
+        data: '${xList || []}',
+        axisLine: {
+          lineStyle: {
+            color: '#e0e0e0',
+          },
+        },
+        axisLabel: {
+          color: '#666',
+          fontWeight: 'bold',
+        },
+        splitLine: {
+          show: false,
+        },
+        axisTick: {
+          show: false,
+        },
+      },
+      yAxis: [
+        {
+          scale: true,
+          axisLine: {
+            lineStyle: {
+              color: '#e0e0e0',
+            },
+          },
+          axisLabel: {
+            color: '#666',
+            fontWeight: 'bold',
+            formatter: function (value: number) {
+              return value.toFixed(2)
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              type: 'dashed',
+              color: '#f0f0f0',
+            },
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+        {
+          scale: true,
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: false
+          },
+          splitLine: {
+            show: false
+          }
+        },
+      ],
+      dataZoom: [
+        {
+          type: 'inside',
+          start: 0,
+          end: 100,
+        },
+        {
+          show: true,
+          type: 'slider',
+          top: '90%',
+          start: 0,
+          end: 100,
+        },
+      ],
+      series: [
+        {
+          type: 'candlestick',
+          data: '${yList || []}',
+          yAxisIndex: 0,
+          itemStyle: {
+            color: '#eb5454',
+            color0: '#4aaa93',
+            borderColor: '#eb5454',
+            borderColor0: '#4aaa93',
+            borderWidth: 1,
+          },
+        },
+        {
+          type: 'line',
+          yAxisIndex: 0,
+          data: '${sma10 || []}',
+          smooth: true,
+          symbol: 'none',
+          lineStyle: {
+            color: 'rgba(25,147,51,0.5)',
+          },
+        },
+        {
+          type: 'line',
+          yAxisIndex: 0,
+          data: '${sma30 || []}',
+          smooth: true,
+          symbol: 'none',
+          lineStyle: {
+            color: 'rgba(10,94,131,0.5)',
+          },
+        },
+        {
+          type: 'line',
+          yAxisIndex: 0,
+          data: '${sma60 || []}',
+          smooth: true,
+          symbol: 'none',
+          lineStyle: {
+            color: 'rgba(231,15,130,0.5)',
+          },
+        },
+      ],
+    },
+  }
+}
+
+export function stockListColumns(idField: string = 'id', extraColumns: Array<ColumnSchema> = []) {
   return [
     {
       name: 'code',
@@ -346,7 +752,7 @@ export function stockListColumns(navigate: NavigateFunction) {
     {
       name: 'name',
       label: '简称',
-      width: 150,
+      width: 100,
     },
     {
       name: 'fullname',
@@ -370,6 +776,7 @@ export function stockListColumns(navigate: NavigateFunction) {
       align: 'center',
       ...date('listedDate'),
     },
+    ...extraColumns,
     {
       type: 'operation',
       label: '操作',
@@ -379,18 +786,220 @@ export function stockListColumns(navigate: NavigateFunction) {
           type: 'action',
           label: '详情',
           level: 'link',
-          onEvent: {
-            click: {
-              actions: [
-                {
-                  actionType: 'custom',
-                  // @ts-ignore
-                  script: (context, action, event) => {
-                    navigate(`/stock/detail/${context.props.data['id']}`)
+          actionType: 'dialog',
+          dialog: {
+            title: '股票详情',
+            size: 'full',
+            ...readOnlyDialogOptions(),
+            body: [
+              {
+                type: 'property',
+                items: [
+                  {label: '编码', content: '${code}'},
+                  {label: '名称', content: '${name}'},
+                  {label: '全名', content: '${fullname}'},
+                  {
+                    label: '市场',
+                    content: {
+                      ...remoteMappings('stock_market', 'market'),
+                      value: '${market}',
+                    },
                   },
-                },
-              ],
-            },
+                  {label: '行业', content: '${industry}'},
+                  {label: '上市日期', content: '${listedDate}'},
+                ],
+              },
+              {type: 'divider'},
+              {
+                type: 'service',
+                api: `get:${commonInfo.baseUrl}/stock/finance/\${${idField}}`,
+                body: [
+                  '资产负债表',
+                  {
+                    className: 'my-2',
+                    type: 'property',
+                    column: 4,
+                    items: [
+                      {
+                        label: financePropertyLabel(idField, '总资产', 'FINANCE', 'totalAssets'),
+                        content: '${balanceSheet.totalAssets}',
+                        span: 2,
+                      },
+                      {
+                        label: financePropertyLabel(idField, '总负债', 'FINANCE', 'totalLiabilities'),
+                        content: '${balanceSheet.totalLiabilities}',
+                        span: 2,
+                      },
+                      {
+                        label: financePropertyLabel(idField, '流动资产', 'FINANCE', 'currentAssets'),
+                        content: '${balanceSheet.currentAssets}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '流动资产占比', 'PERCENTAGE', 'currentAssetsToTotalAssetsRatio'),
+                        content: '${balanceSheet.currentAssetsRatio}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '流动负债', 'FINANCE', 'currentLiabilities'),
+                        content: '${balanceSheet.currentLiabilities}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '流动负债占比', 'PERCENTAGE', 'currentLiabilitiesToTotalAssetsRatio'),
+                        content: '${balanceSheet.currentLiabilitiesRatio}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '非流动资产', 'FINANCE', 'fixedAssets'),
+                        content: '${balanceSheet.fixedAssets}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '非流动资产占比', 'PERCENTAGE', 'fixedAssetsToTotalAssetsRatio'),
+                        content: '${balanceSheet.fixedAssetsRatio}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '非流动负债', 'FINANCE', 'longTermLiabilities'),
+                        content: '${balanceSheet.longTermLiabilities}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '非流动负债占比', 'PERCENTAGE', 'longTermLiabilitiesToTotalAssetsRatio'),
+                        content: '${balanceSheet.longTermLiabilitiesRatio}',
+                      },
+                    ],
+                  },
+                  '利润表',
+                  {
+                    className: 'my-2',
+                    type: 'property',
+                    items: [
+                      {
+                        label: financePropertyLabel(idField, '营业收入', 'FINANCE', 'operatingRevenue'),
+                        content: '${income.operatingRevenue}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '营业成本', 'FINANCE', 'operatingCost'),
+                        content: '${income.operatingCost}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '营业利润', 'FINANCE', 'operatingProfit'),
+                        content: '${income.operatingProfit}',
+                      },
+                    ],
+                  },
+                  '现金流量表',
+                  {
+                    className: 'my-2',
+                    type: 'property',
+                    items: [
+                      {
+                        label: financePropertyLabel(idField, '净利润', 'FINANCE', 'netProfit'),
+                        content: '${cashFlow.netProfit}',
+                        span: 3,
+                      },
+                      {
+                        label: financePropertyLabel(idField, '营业活动现金流量', 'FINANCE', 'cashFlowFromOperatingActivities'),
+                        content: '${cashFlow.cashFlowFromOperatingActivities}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '投资活动现金流量', 'FINANCE', 'cashFlowFromInvestingActivities'),
+                        content: '${cashFlow.cashFlowFromInvestingActivities}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '筹资活动现金流量', 'FINANCE', 'cashFlowFromFinancingActivities'),
+                        content: '${cashFlow.cashFlowFromFinancingActivities}',
+                      },
+                    ],
+                  },
+                  '财务指标',
+                  {
+                    className: 'my-2',
+                    type: 'property',
+                    column: 4,
+                    items: [
+                      {
+                        label: financePropertyLabel(idField, '流动比率', 'FINANCE', 'currentRatio'),
+                        content: '${indicate.currentRatio}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '速动比率', 'FINANCE', 'quickRatio'),
+                        content: '${indicate.quickRatio}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, 'ROE', 'FINANCE', 'returnOnEquity'),
+                        content: '${indicate.roe}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, 'ROA', 'FINANCE', 'returnOnAssets'),
+                        content: '${indicate.roa}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '应收账款周转率', 'FINANCE', 'accountsReceivableTurnover'),
+                        content: '${indicate.accountsReceivableTurnover}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '应收账款周转天数', 'DAYS', 'daysAccountsReceivableTurnover'),
+                        content: '${indicate.daysAccountsReceivableTurnover}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '存货周转率', 'FINANCE', 'inventoryTurnover'),
+                        content: '${indicate.inventoryTurnover}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '存货周转天数', 'DAYS', 'daysInventoryTurnover'),
+                        content: '${indicate.daysInventoryTurnover}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '固定资产周转率', 'FINANCE', 'fixedAssetsTurnover'),
+                        content: '${indicate.fixedAssetsTurnover}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '固定资产周转天数', 'DAYS', 'daysFixedAssetsTurnover'),
+                        content: '${indicate.daysFixedAssetsTurnover}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '总资产周转率', 'FINANCE', 'totalAssetsTurnover'),
+                        content: '${indicate.totalAssetsTurnover}',
+                      },
+                      {
+                        label: financePropertyLabel(idField, '总资产周转天数', 'DAYS', 'daysTotalAssetsTurnover'),
+                        content: '${indicate.daysTotalAssetsTurnover}',
+                      },
+                    ],
+                  },
+                ],
+              },
+              {type: 'divider'},
+              {
+                type: 'service',
+                api: `get:${commonInfo.baseUrl}/stock/daily/current/\${${idField}}`,
+                body: [
+                  "现价 (${date})",
+                  {
+                    className: 'my-2',
+                    type: 'property',
+                    column: 4,
+                    items: [
+                      {label: '开盘价', content: '${open}'},
+                      {label: '收盘价', content: '${close}'},
+                      {label: '最高价', content: '${high}'},
+                      {label: '最低价', content: '${low}'},
+                    ],
+                  },
+                ],
+              },
+              candleChart(
+                '100日线数据',
+                '后复权数据',
+                `get:${commonInfo.baseUrl}/stock/daily/\${${idField}}`,
+              ),
+              candleChart(
+                '50周线数据',
+                '后复权数据',
+                `get:${commonInfo.baseUrl}/stock/weekly/\${${idField}}`,
+              ),
+              candleChart(
+                '24月线数据',
+                '后复权数据',
+                `get:${commonInfo.baseUrl}/stock/monthly/\${${idField}}`,
+              ),
+            ],
           },
         },
       ],

pom.xml

@@ -63,6 +63,11 @@
         <artifactId>hutool-http</artifactId>
         <version>${hutool.version}</version>
       </dependency>
+      <dependency>
+        <groupId>cn.hutool</groupId>
+        <artifactId>hutool-extra</artifactId>
+        <version>${hutool.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>com.yomahub</groupId>