From 0a37b816117828dfc216d00c17724900f4bb14e3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 四月 2026 14:29:23 +0800
Subject: [PATCH] 123
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorBackgroundService.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 2439112..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,23 +43,22 @@
executorService = Executors.newSingleThreadScheduledExecutor(r -> {
Thread thread = new Thread(r);
thread.setName("cv-background-thread");
- thread.setDaemon(true);
+ //thread.setDaemon(true);
return thread;
});
// 鍚姩瀹氭椂浠诲姟
- executorService.scheduleAtFixedRate(this::processConveyorTasks,
+ executorService.scheduleWithFixedDelay(this::processConveyorTasks,
properties.getInitialDelay(),
properties.getInterval(),
TimeUnit.MILLISECONDS);
- running.set(true);
- log.info("杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼鍒濆鍖栧畬鎴�");
+ News.info("杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼鍒濆鍖栧畬鎴�");
}
private void processConveyorTasks() {
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get() || !running.get()) {
- log.debug("绯荤粺鏈繍琛屾垨鏈嶅姟宸插仠姝紝璺宠繃杈撻�佺嚎浠诲姟澶勭悊");
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ News.info("绯荤粺鏈繍琛屾垨鏈嶅姟宸插仠姝紝璺宠繃杈撻�佺嚎浠诲姟澶勭悊");
return;
}
long currentTime = System.currentTimeMillis();
@@ -68,21 +66,23 @@
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) {
- log.error("杈撻�佺嚎浠诲姟澶勭悊寮傚父", e);
}
+
}
@PreDestroy
public void shutDown() {
- running.set(false);
if (executorService != null && !executorService.isShutdown()) {
- log.info("姝ｅ湪鍏抽棴杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼...");
+ News.info("姝ｅ湪鍏抽棴杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼...");
executorService.shutdown();
try {
if (!executorService.awaitTermination(5, TimeUnit.SECONDS)) {
@@ -92,7 +92,7 @@
executorService.shutdownNow();
Thread.currentThread().interrupt();
}
- log.info("杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼宸插叧闂�");
+ News.info("杈撻�佺嚎鍚庡彴鏈嶅姟绾跨▼宸插叧闂�");
}
}
}
--
Gitblit v1.9.1