From ab389a5a6b329b15a655340ba7b87bce7fd7871d Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 24 十二月 2025 17:16:19 +0800
Subject: [PATCH] 添加新增设备自动生成编码
---
mes-processes/mes-plcSend/src/main/java/com/mes/task/service/impl/TaskStatusNotificationServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/task/service/impl/TaskStatusNotificationServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/task/service/impl/TaskStatusNotificationServiceImpl.java
index 451e98a..30c7291 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/task/service/impl/TaskStatusNotificationServiceImpl.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/task/service/impl/TaskStatusNotificationServiceImpl.java
@@ -5,6 +5,7 @@
import com.mes.task.entity.TaskStepDetail;
import com.mes.task.service.TaskStatusNotificationService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.connector.ClientAbortException;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
@@ -205,7 +206,7 @@
.data(createMessage("", data)));
} catch (IOException e) {
// 瀹㈡埛绔柇寮�杩炴帴鏄甯告儏鍐碉紝浣跨敤DEBUG绾у埆
- if (e instanceof org.apache.catalina.connector.ClientAbortException) {
+ if (e instanceof ClientAbortException) {
log.debug("瀹㈡埛绔柇寮�SSE杩炴帴: taskId={}, event={}", taskId, eventName);
} else {
log.warn("鍙戦�丼SE娑堟伅澶辫触: taskId={}, event={}", taskId, eventName, e);
@@ -234,7 +235,7 @@
.data(createMessage("", data)));
} catch (IOException e) {
// 瀹㈡埛绔柇寮�杩炴帴鏄甯告儏鍐碉紝浣跨敤DEBUG绾у埆
- if (e instanceof org.apache.catalina.connector.ClientAbortException) {
+ if (e instanceof ClientAbortException) {
log.debug("瀹㈡埛绔柇寮�SSE杩炴帴: event={}", eventName);
} else {
log.warn("鍙戦�丼SE娑堟伅澶辫触: event={}", eventName, e);
@@ -306,6 +307,7 @@
data.put("durationMs", step.getDurationMs() != null ? step.getDurationMs() : 0);
data.put("retryCount", step.getRetryCount() != null ? step.getRetryCount() : 0);
data.put("errorMessage", step.getErrorMessage() != null ? step.getErrorMessage() : "");
+ data.put("successMessage", step.getSuccessMessage() != null ? step.getSuccessMessage() : "");
return data;
}
@@ -314,7 +316,7 @@
*/
private String createMessage(String message, Map<String, Object> data) {
try {
- Map<String, Object> result = new java.util.HashMap<>();
+ Map<String, Object> result = new HashMap<>();
result.put("timestamp", System.currentTimeMillis());
if (message != null && !message.isEmpty()) {
result.put("message", message);
--
Gitblit v1.8.0