From 73aa66976e35252378be3f09be2474193ccd0bf6 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 05 十二月 2025 17:15:20 +0800
Subject: [PATCH] 修改任务执行步骤状态完成检验
---
mes-common/serverBase/src/main/java/com/mes/exception/GlobalExceptionHandler.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/mes-common/serverBase/src/main/java/com/mes/exception/GlobalExceptionHandler.java b/mes-common/serverBase/src/main/java/com/mes/exception/GlobalExceptionHandler.java
index fc6f5f2..0ae08fb 100644
--- a/mes-common/serverBase/src/main/java/com/mes/exception/GlobalExceptionHandler.java
+++ b/mes-common/serverBase/src/main/java/com/mes/exception/GlobalExceptionHandler.java
@@ -2,9 +2,15 @@
import com.mes.result.Result;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.HttpMediaTypeNotAcceptableException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @author zhoush
@@ -22,10 +28,35 @@
return Result.error(se.getCode(), se.getMessage());
}
+ /**
+ * 澶勭悊濯掍綋绫诲瀷涓嶅尮閰嶅紓甯革紙閫氬父鍙戠敓鍦⊿SE杩炴帴宸插叧闂椂锛�
+ */
+ @ExceptionHandler(HttpMediaTypeNotAcceptableException.class)
+ @ResponseStatus(HttpStatus.NOT_ACCEPTABLE)
+ @ResponseBody
+ public Result<Object> handleMediaTypeNotAcceptable(HttpMediaTypeNotAcceptableException e, HttpServletRequest request) {
+ // 濡傛灉鏄疭SE璇锋眰锛岄潤榛樺鐞嗭紝涓嶈褰曢敊璇�
+ String acceptHeader = request.getHeader("Accept");
+ if (acceptHeader != null && acceptHeader.contains("text/event-stream")) {
+ log.debug("SSE杩炴帴宸插叧闂紝蹇界暐濯掍綋绫诲瀷寮傚父: {}", e.getMessage());
+ return null; // 杩斿洖null锛屼笉鍐欏叆鍝嶅簲
+ }
+ log.warn("濯掍綋绫诲瀷涓嶅尮閰�: {}", e.getMessage());
+ return Result.error();
+ }
+
@ExceptionHandler(Exception.class)
@ResponseBody
- public Result<Object> error(Exception e) {
- e.printStackTrace();
+ public Result<Object> error(Exception e, HttpServletRequest request) {
+ // 濡傛灉鏄疭SE璇锋眰涓旀槸濯掍綋绫诲瀷寮傚父锛岄潤榛樺鐞�
+ if (e instanceof HttpMediaTypeNotAcceptableException) {
+ String acceptHeader = request.getHeader("Accept");
+ if (acceptHeader != null && acceptHeader.contains("text/event-stream")) {
+ log.debug("SSE杩炴帴宸插叧闂紝蹇界暐寮傚父: {}", e.getMessage());
+ return null;
+ }
+ }
+ log.error("鍏ㄥ眬寮傚父澶勭悊: ", e);
return Result.error();
}
--
Gitblit v1.8.0