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/ConveyorOperationExecutor.java | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
index 8393115..7c0fce6 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/ConveyorOperationExecutor.java
@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation;
+import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
import lombok.extern.slf4j.Slf4j;
@@ -21,38 +22,20 @@
// 鑷姩娉ㄥ唽鎵�鏈夋搷浣滃鐞嗗櫒
for (OperationHandler handler : handlers) {
handlerMap.put(handler.getType(), handler);
- log.info("娉ㄥ唽杈撻�佺嚎鎿嶄綔澶勭悊鍣�: {}", handler.getType());
+ News.info("娉ㄥ唽杈撻�佺嚎鎿嶄綔澶勭悊鍣�: {}", handler.getType());
}
}
public void execute(CtuOperationConfig config) {
OperationHandler handler = handlerMap.get(config.getType());
if (handler == null) {
- log.warn("鏈壘鍒版搷浣滃鐞嗗櫒: {}", config.getType());
+ News.warn("鏈壘鍒版搷浣滃鐞嗗櫒: {}", config.getType());
return;
}
-
- int retryCount = 0;
- while (retryCount < config.getMaxRetries()) {
- try {
- handler.execute(config);
- return;
- } catch (Exception e) {
- retryCount++;
- if (retryCount >= config.getMaxRetries()) {
- log.error("鎿嶄綔鎵ц澶辫触锛屽凡杈惧埌鏈�澶ч噸璇曟鏁�: {}", config.getType(), e);
- } else {
- log.warn("鎿嶄綔鎵ц澶辫触锛屾鍦ㄩ噸璇�({}/{})",
- retryCount, config.getMaxRetries(), e);
- try {
- Thread.sleep(config.getRetryDelay());
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- log.error("閲嶈瘯浼戠湢琚腑鏂�", ie);
- return;
- }
- }
- }
+ try {
+ handler.execute(config);
+ } catch (Exception e) {
+ News.error("鎿嶄綔鎵ц澶辫触锛岀瓑寰呬笅涓�鍛ㄦ湡閲嶈瘯: {}", config.getType(), e);
}
}
}
--
Gitblit v1.9.1