From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java
index 8d38600..819b25f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java
@@ -8,6 +8,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.zy.acs.common.utils.News;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -37,39 +38,36 @@
this.consumerExecutor.execute(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
-
+ Thread.sleep(10);
List<UnlockPathTask> tasks = new ArrayList<>();
// if unlockTaskQueue was empty, then block
-// tasks.add(unlockTaskQueue.take());
+ tasks.add(unlockTaskQueue.take());
unlockTaskQueue.drainTo(tasks);
- if (tasks.isEmpty()) {
- Thread.sleep(30);
- } else {
-
+ if (!Cools.isEmpty(tasks)) {
long startTime = System.currentTimeMillis();
List<int[]> resetCodeIdxList = null;
if (tasks.size() == 1) {
resetCodeIdxList = this.getResetCodeList(lev, tasks.get(0));
} else if (tasks.size() > 1) {
- log.info("consumer task count:{}", tasks.size());
- resetCodeIdxList = this.getResetCodeList(lev,tasks);
+// News.info("consumer task count:{}", tasks.size());
+ resetCodeIdxList = this.getResetCodeList(lev, tasks);
}
if (!Cools.isEmpty(resetCodeIdxList)) {
this.dealResetCodeList(lev, resetCodeIdxList);
}
- log.info("consumer unlock path spend time:{}", System.currentTimeMillis() - startTime);
+// News.info("consumer unlock path spend time:{}", System.currentTimeMillis() - startTime);
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- log.error("PathQueueConsumer[Thread.currentThread.interrupt]", e);
+ News.error("PathQueueConsumer[Thread.currentThread.interrupt]", e);
break;
} catch (Exception e) {
- log.error("PathQueueConsumer", e);
+ News.error("PathQueueConsumer", e);
}
}
});
@@ -207,7 +205,7 @@
if (!this.consumerExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
this.consumerExecutor.shutdownNow();
if (!this.consumerExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
- log.error("this.consumerExecutor failed to shutdown");
+ News.error("this.consumerExecutor failed to shutdown");
}
}
} catch (InterruptedException ie) {
@@ -217,4 +215,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1