From 6404cb07e5281cfd901267c4fd560ba89bd5e2fd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ysz' into ysz
---
src/main/java/com/nq/utils/task/stock/StockTask.java | 77 +++++++++++++++-----------------------
1 files changed, 31 insertions(+), 46 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..f41d9d9 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -51,39 +52,51 @@
private static final Logger log = LoggerFactory.getLogger(StockTask.class);
+ private final AtomicBoolean syncMASStockData = new AtomicBoolean(false);
- boolean syncINStockData = true;
+ private final Lock syncMASStockDataLock = new ReentrantLock();
- private final Lock syncINStockDataLock = new ReentrantLock();
+ private final AtomicBoolean syncSGPStockData = new AtomicBoolean(false);
+
+ private final Lock syncSGPStockDataLock = new ReentrantLock();
/**
- * 同步系统所需要的股票
+ * 同步马来西亚系统所需要的股票
*/
- @Scheduled(cron = "0 0 0/2 * * ?")
- public void syncINStockData() {
- if (syncINStockData) // 定义一个布尔变量，代表新闻任务是否在处理中
+ @Scheduled(cron = "0 0/1 * * * ?")
+ public void syncMASStockData() {
+ if (syncMASStockData.get()) { // 判断任务是否在处理中
return;
- syncINStockData = true;
- if (syncINStockDataLock.tryLock()) {
+ }
+ if (syncMASStockDataLock.tryLock()) {
try {
- loadAllStock(EStockType.IN);
-// loadAllStock(EStockType.HK);
+ syncMASStockData.set(true); // 设置处理中标识为true
+ loadAllStock(EStockType.MAS);
} finally {
- syncINStockDataLock.unlock();
- syncINStockData = false;
+ syncMASStockDataLock.unlock();
+ syncMASStockData.set(false); // 设置处理中标识为false
}
}
}
-
/**
- * 同步美国股票
+ * 新加坡系统所需要的股票
*/
-// @Scheduled(cron = "0 0/30 * * * ?")
- public void loadStockCompanies() {
- loadAllCompanies();
+ @Scheduled(cron = "0/10 * * * * ?")
+ public void syncSGPStockData() {
+ if (syncSGPStockData.get()) { // 判断任务是否在处理中
+ return;
+ }
+ if (syncSGPStockDataLock.tryLock()) {
+ try {
+ syncSGPStockData.set(true); // 设置处理中标识为true
+ loadAllStock(EStockType.SGP);
+ } finally {
+ syncSGPStockDataLock.unlock();
+ syncSGPStockData.set(false); // 设置处理中标识为false
+ }
+ }
}
-
/**
* 加载公司信息
@@ -167,34 +180,6 @@
} catch (
Exception e) {
log.error("同步出错", e);
- }
- }
-
- boolean stockConstraint = true;
-
- /**
- * 强制平仓
- */
- @Scheduled(cron = "0/1 * * * * ?")
- public void stockConstraint() {
- if (stockConstraint) // 定义一个布尔变量，代表新闻任务是否在处理中
- return;
- stockConstraint = true;
- if (stockConstraintLock.tryLock()) {
- try {
- List<UserPosition> userPositions = userPositionMapper.selectList(new LambdaQueryWrapper<UserPosition>().isNull(UserPosition::getSellOrderId));
- if (CollectionUtils.isNotEmpty(userPositions)) {
- userPositionService.stockConstraint(userPositions);
- }
- } catch (Exception e) {
- e.printStackTrace();
- log.error("强制平仓任务错误：" + e.getMessage());
- } finally {
- stockConstraintLock.unlock();
- stockConstraint = false;
- }
- } else {
- log.info("强制平仓任务--------->上次任务还未执行完成，本次任务忽略");
}
}
}
--
Gitblit v1.9.3