From fc4b1e66b241df686dbd7bebb6df6793060a8107 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 10 Nov 2024 21:36:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/utils/task/stock/CarryPositionTask.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java b/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
index 1178088..f32e7c4 100644
--- a/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
+++ b/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
@@ -5,14 +5,8 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.nq.common.ServerResponse;
-import com.nq.dao.StockSubscribeMapper;
-import com.nq.dao.UserAssetsMapper;
-import com.nq.dao.UserMapper;
-import com.nq.dao.UserStockSubscribeMapper;
-import com.nq.pojo.StockSubscribe;
-import com.nq.pojo.User;
-import com.nq.pojo.UserAssets;
-import com.nq.pojo.UserStockSubscribe;
+import com.nq.dao.*;
+import com.nq.pojo.*;
import com.nq.service.IUserAssetsServices;
import com.nq.service.IUserPositionService;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +17,7 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -52,19 +47,24 @@
@Autowired
IUserAssetsServices userAssetsServices;
+ @Autowired
+ StockMapper stockMapper;
+
private final Lock ballotLock = new ReentrantLock();
private final Lock subscriptionLock = new ReentrantLock();
- boolean ballot = true;
+ private final AtomicBoolean ballot = new AtomicBoolean(false);
- @Scheduled(cron = "0 0/10 * * * ?")
+
+ @Scheduled(cron = "0 0/1 * * * ?")
public void ballot() {
- if (ballot)
- ballot = false;
- else return;
+ if (ballot.get()) { // 判断任务是否在处理中
+ return;
+ }
if (ballotLock.tryLock()) {
try {
+ ballot.set(true); // 设置处理中标识为true
log.info("新股上市转持仓定时任务--------->开始");
List<StockSubscribe> stockSubscribes = stockSubscribeMapper.selectList(new LambdaQueryWrapper<StockSubscribe>()
.lt(StockSubscribe::getListDate, DateUtil.date()));
@@ -88,26 +88,29 @@
log.error("新股上市转持仓定时任务发生异常", e);
} finally {
ballotLock.unlock();
- ballot = true;
+ ballot.set(false); // 设置处理中标识为false
}
} else {
log.info("新股上市转持仓定时任务--------->上次任务还未执行完成，本次任务忽略");
}
}
- boolean subscription = true;
+ private final AtomicBoolean subscription = new AtomicBoolean(false);
+
@Scheduled(cron = "0 0/1 * * * ?")
public void subscription() {
- if (subscription)
- subscription = false;
- else return;
+ if (subscription.get()) { // 判断任务是否在处理中
+ return;
+ }
if (subscriptionLock.tryLock()) {
try {
+ subscription.set(true); // 设置处理中标识为true
log.info("自动转已认缴--------->开始");
List<UserStockSubscribe> userStockSubscribes = userStockSubscribeMapper.selectList(new LambdaQueryWrapper<UserStockSubscribe>()
.eq(UserStockSubscribe::getStatus, 3));
userStockSubscribes.forEach(f->{
- UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId("IN",f.getUserId());
+ Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<>(Stock.class).eq(Stock::getStockCode, f.getNewCode()));
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(stock.getStockType(),f.getUserId());
if(null != userAssets && userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) == 0){
f.setStatus(4);
userStockSubscribeMapper.updateById(f);
@@ -118,7 +121,7 @@
log.error("自动转已认缴定时任务发生异常", e);
} finally {
subscriptionLock.unlock();
- subscription = true;
+ subscription.set(false); // 设置处理中标识为false
}
} else {
log.info("自动转已认缴定时任务--------->上次任务还未执行完成，本次任务忽略");
--
Gitblit v1.9.3