From c1289aa55b47d436ffa478095074f7ab23aa88a1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 28 Jul 2025 01:22:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/utils/task/stock/StockTask.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nq/utils/task/stock/StockTask.java b/src/main/java/com/nq/utils/task/stock/StockTask.java
index 619e482..261a03b 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -25,8 +25,11 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
@Component
@@ -52,25 +55,26 @@
private static final Logger log = LoggerFactory.getLogger(StockTask.class);
- boolean syncINStockData = true;
+
+ private final AtomicBoolean syncINStockData = new AtomicBoolean(false);
private final Lock syncINStockDataLock = new ReentrantLock();
/**
* 同步系统所需要的股票
*/
- @Scheduled(cron = "0 0 0/2 * * ?")
+ @Scheduled(cron = "0 0/1 * * * ?")
public void syncINStockData() {
- if (syncINStockData) // 定义一个布尔变量，代表新闻任务是否在处理中
+ if (syncINStockData.get()) { // 判断任务是否在处理中
return;
- syncINStockData = true;
+ }
if (syncINStockDataLock.tryLock()) {
try {
- loadAllStock(EStockType.IN);
-// loadAllStock(EStockType.HK);
+ syncINStockData.set(true); // 设置处理中标识为true
+ loadAllStock(EStockType.JP);
} finally {
syncINStockDataLock.unlock();
- syncINStockData = false;
+ syncINStockData.set(false); // 设置处理中标识为false
}
}
}
@@ -127,6 +131,17 @@
break;
}
}
+ List<DataStockBean> filteredList = list.stream()
+ .collect(Collectors.groupingBy(
+ stock -> stock.getSymbol() + "|" + stock.getName()
+ ))
+ .values().stream()
+ .flatMap(group -> group.stream()
+ .filter(stock -> group.size() == 1 || "TSE".equals(stock.getType()))
+ .limit(1) // 每组最多取 1 条
+ )
+ .collect(Collectors.toList());
+ list = filteredList;
for (DataStockBean o : list) {
Stock stock = stockMapper.findStockByCode(o.getId());
if (stock == null) {
@@ -170,18 +185,19 @@
}
}
- boolean stockConstraint = true;
+ private final AtomicBoolean stockConstraint = new AtomicBoolean(false);
/**
* 强制平仓
*/
- @Scheduled(cron = "0/1 * * * * ?")
+// @Scheduled(cron = "0/1 * * * * ?")
public void stockConstraint() {
- if (stockConstraint) // 定义一个布尔变量，代表新闻任务是否在处理中
+ if (stockConstraint.get()) { // 判断任务是否在处理中
return;
- stockConstraint = true;
+ }
if (stockConstraintLock.tryLock()) {
try {
+ stockConstraint.set(true); // 设置处理中标识为true
List<UserPosition> userPositions = userPositionMapper.selectList(new LambdaQueryWrapper<UserPosition>().isNull(UserPosition::getSellOrderId));
if (CollectionUtils.isNotEmpty(userPositions)) {
userPositionService.stockConstraint(userPositions);
@@ -191,7 +207,7 @@
log.error("强制平仓任务错误：" + e.getMessage());
} finally {
stockConstraintLock.unlock();
- stockConstraint = false;
+ stockConstraint.set(false); // 设置处理中标识为false
}
} else {
log.info("强制平仓任务--------->上次任务还未执行完成，本次任务忽略");
--
Gitblit v1.9.3