diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index edd3629..c4dae1d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -85,6 +85,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -95,6 +167,8 @@
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 463551f..7ace097 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file
diff --git a/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/Stock.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/Stock.java
index cd0e838..50a4707 100644
--- a/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/Stock.java
+++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/Stock.java
@@ -65,6 +65,19 @@ public class Stock extends SimpleEntity {
@ToString.Exclude
private Set indicators;
+ @Override
+ public boolean equals(Object o) {
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Stock stock = (Stock) o;
+ return code.equals(stock.code);
+ }
+
+ @Override
+ public int hashCode() {
+ return code.hashCode();
+ }
+
@Getter
@AllArgsConstructor
public enum Market implements SimpleEnum {
diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java
index 58f57e6..4e18d80 100644
--- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java
+++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/QuartzService.java
@@ -36,7 +36,7 @@ public class QuartzService {
var tasks = new ArrayList();
for (var key : scheduler.getJobKeys(GroupMatcher.anyGroup())) {
var detail = scheduler.getJobDetail(key);
- var trigger = (CronTrigger) scheduler.getTriggersOfJob(key).get(0);
+ var trigger = (CronTrigger) scheduler.getTriggersOfJob(key).getFirst();
tasks.add(new QuartzTask(
detail.getKey().getName(),
detail.getJobDataMap().getLong("template_id"),
diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/CheckDailyNode.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/CheckDailyNode.java
index 737f775..10beccd 100644
--- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/CheckDailyNode.java
+++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/CheckDailyNode.java
@@ -41,7 +41,7 @@ public class CheckDailyNode extends TaskNodeComponent {
.data()
.items()
.stream()
- .map(item -> LocalDate.parse(item.get(0), TuShareService.TRADE_FORMAT))
+ .map(item -> LocalDate.parse(item.getFirst(), TuShareService.TRADE_FORMAT))
.filter(date -> date.isBefore(nowDate) || date.isEqual(nowDate))
.toList();
var total = stocks.size();
diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateDailyNode.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateDailyNode.java
index 984719a..d89adce 100644
--- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateDailyNode.java
+++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/service/task/UpdateDailyNode.java
@@ -42,8 +42,8 @@ public class UpdateDailyNode extends NodeComponent {
for (String exchange : List.of("SSE", "SZSE", "BSE")) {
var response = tuShareService.tradeDateList(exchange);
for (List item : response.data().items()) {
- if (ObjectUtil.isNotEmpty(item) && StrUtil.isNotBlank(item.get(0))) {
- tradeDates.add(LocalDate.parse(item.get(0), TuShareService.TRADE_FORMAT));
+ if (ObjectUtil.isNotEmpty(item) && StrUtil.isNotBlank(item.getFirst())) {
+ tradeDates.add(LocalDate.parse(item.getFirst(), TuShareService.TRADE_FORMAT));
}
}
}
@@ -53,7 +53,7 @@ public class UpdateDailyNode extends NodeComponent {
tradeDates.parallelStream()
.filter(date -> date.isBefore(nowDate) || date.isEqual(nowDate))
.filter(date -> !existsTradeDates.contains(date))
- .filter(date -> date.isAfter(LocalDate.of(2024, 12, 31)))
+ // .filter(date -> date.isAfter(LocalDate.of(2024, 12, 31)))
.forEach(tradeDate -> {
var factorResponse = tuShareService.factorList(tradeDate);
var factorMap = new HashMap();
diff --git a/pom.xml b/pom.xml
index a9ad4e1..30d95d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,9 @@
- 17
- 17
- 17
+ 21
+ 21
+ 21
UTF-8
3.5.0