From 86e784154596976f582fbcc6f447465309b1a51d Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 15 May 2024 00:03:48 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/utils/task/stock/CarryPositionTask.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 4469cee..ebf714f 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,10 +57,17 @@
 
     private final Lock subscriptionLock = new ReentrantLock();
 
+    private final AtomicBoolean ballot = new AtomicBoolean(false);
+
+
     @Scheduled(cron = "0 0/10 * * * ?")
     public void ballot() {
+        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()));
@@ -83,16 +91,23 @@
                 log.error("新股上市转持仓定时任务发生异常", e);
             } finally {
                 ballotLock.unlock();
+                ballot.set(false); // 设置处理中标识为false
             }
         } else {
             log.info("新股上市转持仓定时任务--------->上次任务还未执行完成,本次任务忽略");
         }
     }
 
+    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));
@@ -108,6 +123,7 @@
                 log.error("自动转已认缴定时任务发生异常", e);
             } finally {
                 subscriptionLock.unlock();
+                subscription.set(false); // 设置处理中标识为false
             }
         } else {
             log.info("自动转已认缴定时任务--------->上次任务还未执行完成,本次任务忽略");

--
Gitblit v1.9.3