From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java b/src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java
index f5dff67..0333e0d 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java
@@ -1,13 +1,14 @@
package com.genersoft.iot.vmp.conf;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
-import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -33,14 +34,37 @@
}
/**
+ * 榛樿寮傚父澶勭悊
+ * @param e 寮傚父
+ * @return 缁熶竴杩斿洖缁撴灉
+ */
+ @ExceptionHandler(IllegalStateException.class)
+ @ResponseStatus(HttpStatus.BAD_REQUEST)
+ public WVPResult<String> exceptionHandler(IllegalStateException e) {
+ return WVPResult.fail(ErrorCode.ERROR400);
+ }
+
+ /**
+ * 榛樿寮傚父澶勭悊
+ * @param e 寮傚父
+ * @return 缁熶竴杩斿洖缁撴灉
+ */
+ @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+ @ResponseStatus(HttpStatus.BAD_REQUEST)
+ public WVPResult<String> exceptionHandler(HttpRequestMethodNotSupportedException e) {
+ return WVPResult.fail(ErrorCode.ERROR400);
+ }
+
+
+ /**
* 鑷畾涔夊紓甯稿鐞嗭紝 澶勭悊controller涓繑鍥炵殑閿欒
* @param e 寮傚父
* @return 缁熶竴杩斿洖缁撴灉
*/
@ExceptionHandler(ControllerException.class)
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
- public WVPResult<String> exceptionHandler(ControllerException e) {
- return WVPResult.fail(e.getCode(), e.getMsg());
+ public ResponseEntity<WVPResult<String>> exceptionHandler(ControllerException e) {
+ return new ResponseEntity<>(WVPResult.fail(e.getCode(), e.getMsg()), HttpStatus.OK);
}
/**
@@ -50,7 +74,7 @@
*/
@ExceptionHandler(BadCredentialsException.class)
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
- public WVPResult<String> exceptionHandler(BadCredentialsException e) {
- return WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMessage());
+ public ResponseEntity<WVPResult<String>> exceptionHandler(BadCredentialsException e) {
+ return new ResponseEntity<>(WVPResult.fail(ErrorCode.ERROR100.getCode(), e.getMessage()), HttpStatus.OK);
}
}
--
Gitblit v1.8.0