From 9869f39cc82ae584ef4d783bb13316ccd24d26dd Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 四月 2026 10:16:47 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
index fbe9fa1..720790b 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java
@@ -31,7 +31,6 @@
private ScheduledExecutorService executorService;
- private final AtomicBoolean running = new AtomicBoolean(false);
private long lastDbUpdateTime = 0;
@@ -44,7 +43,7 @@
executorService = Executors.newSingleThreadScheduledExecutor(r -> {
Thread thread = new Thread(r);
thread.setName("cv-background-thread");
- thread.setDaemon(true);
+ //thread.setDaemon(true);
return thread;
});
@@ -53,13 +52,12 @@
properties.getInitialDelay(),
properties.getInterval(),
TimeUnit.MILLISECONDS);
- running.set(true);
News.info("杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼鍒濆鍖栧畬鎴�");
}
private void processConveyorTasks() {
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get() || !running.get()) {
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
News.info("绯荤粺鏈繍琛屾垨鏈嶅姟宸插仠姝紝璺宠繃杈撻�佺嚎浠诲姟澶勭悊");
return;
}
@@ -68,19 +66,21 @@
News.info("鎵ц杈撻�佺嚎鎿嶄綔");
lastDbUpdateTime = currentTime;
}
- try {
- // 鎵ц閰嶇疆鐨勬搷浣滃簭鍒�
- for (CtuOperationConfig config : properties.getOperations()) {
+
+ // 鎵ц閰嶇疆鐨勬搷浣滃簭鍒�
+ for (CtuOperationConfig config : properties.getOperations()) {
+ try {
operationExecutor.execute(config);
+ } catch (Exception e) {
+ News.error("杈撻�佺嚎鎿嶄綔鎵ц鏈�缁堝け璐�, type={}, error={}", config.getType(), e.getMessage());
+ // 鍙�夛細鍙戦�佸憡璀︺�佹殏鍋滆皟搴︾瓑
}
- } catch (Exception e) {
- News.error("杈撻�佺嚎浠诲姟澶勭悊寮傚父,{}", e.getMessage());
}
+
}
@PreDestroy
public void shutDown() {
- running.set(false);
if (executorService != null && !executorService.isShutdown()) {
News.info("姝ｅ湪鍏抽棴杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼...");
executorService.shutdown();
--
Gitblit v1.9.1