From bfcbef7a6bf2eb73bbf7ae84dac49a8f49db1e1c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 08 Jul 2025 14:49:45 +0800
Subject: [PATCH] 修改股票类型
---
src/main/java/com/nq/utils/task/stock/CarryPositionTask.java | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 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..bad2a99 100644
--- a/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
+++ b/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
@@ -23,6 +23,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;
@@ -56,58 +57,63 @@
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 {
- log.info("新股上市转持仓定时任务--------->开始");
+ ballot.set(true); // 设置处理中标识为true
+// log.info("新股上市转持仓定时任务--------->开始");
+ log.info("新股上市定时任务--------->开始");
List<StockSubscribe> stockSubscribes = stockSubscribeMapper.selectList(new LambdaQueryWrapper<StockSubscribe>()
.lt(StockSubscribe::getListDate, DateUtil.date()));
if (CollectionUtils.isNotEmpty(stockSubscribes)) {
List<String> codeList = stockSubscribes.stream().map(StockSubscribe::getCode).collect(Collectors.toList());
List<UserStockSubscribe> userStockSubscribes = userStockSubscribeMapper.selectList(new LambdaQueryWrapper<UserStockSubscribe>()
- .eq(UserStockSubscribe::getStatus, 4).in(UserStockSubscribe::getNewCode, codeList));
+ .eq(UserStockSubscribe::getStatus, 5).in(UserStockSubscribe::getNewCode, codeList));
//订单转持仓
userStockSubscribes.forEach(f -> {
- ServerResponse serverResponse = iUserPositionService.newStockToPosition(f.getId());//转持仓
- if(serverResponse.isSuccess()){
- f.setStatus(5);
+// ServerResponse serverResponse = iUserPositionService.newStockToPosition(f.getId(),BigDecimal.ZERO);//转持仓
+// if(serverResponse.isSuccess()){
+ f.setStatus(6);
userStockSubscribeMapper.updateById(f);
- }else{
- log.info("新股上市转持仓失败申购订单id:"+f.getId()+",失败原因："+serverResponse.getMsg());
- }
+// }else{
+// log.info("新股上市定时任务失败申购订单id:"+f.getId()+",失败原因："+serverResponse.getMsg());
+// }
});
}
- log.info("新股上市转持仓定时任务--------->结束");
+ log.info("新股上市定时任务--------->结束");
} catch (Exception e) {
- log.error("新股上市转持仓定时任务发生异常", e);
+ log.error("新股上市定时任务发生异常", e);
} finally {
ballotLock.unlock();
- ballot = true;
+ ballot.set(false); // 设置处理中标识为false
}
} else {
- log.info("新股上市转持仓定时任务--------->上次任务还未执行完成，本次任务忽略");
+ log.info("新股上市定时任务--------->上次任务还未执行完成，本次任务忽略");
}
}
- boolean subscription = true;
- @Scheduled(cron = "0 0/1 * * * ?")
- public void subscription() {
- if (subscription)
- subscription = false;
- else return;
+ private final AtomicBoolean subscription = new AtomicBoolean(false);
+
+// @Scheduled(cron = "0 0/1 * * * ?")
+ /*public void subscription() {
+ 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());
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(EStockType.MX.getCode(), f.getUserId());
if(null != userAssets && userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) == 0){
f.setStatus(4);
userStockSubscribeMapper.updateById(f);
@@ -118,11 +124,11 @@
log.error("自动转已认缴定时任务发生异常", e);
} finally {
subscriptionLock.unlock();
- subscription = true;
+ subscription.set(false); // 设置处理中标识为false
}
} else {
log.info("自动转已认缴定时任务--------->上次任务还未执行完成，本次任务忽略");
}
- }
+ }*/
}
--
Gitblit v1.9.3