From c3ce2bc5d069ba57309567aee4ae418bc0cf75ed Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 17 三月 2023 13:22:05 +0800
Subject: [PATCH] 优化异常处理以及级联设备状态查询
---
src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java | 21 ++++++++++++++++-----
1 files changed, 16 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 0c7c3d2..dbea741 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java
@@ -1,12 +1,12 @@
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.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
@@ -32,6 +32,17 @@
return WVPResult.fail(ErrorCode.ERROR500.getCode(), e.getMessage());
}
+ /**
+ * 榛樿寮傚父澶勭悊
+ * @param e 寮傚父
+ * @return 缁熶竴杩斿洖缁撴灉
+ */
+ @ExceptionHandler(IllegalStateException.class)
+ @ResponseStatus(HttpStatus.BAD_REQUEST)
+ public WVPResult<String> exceptionHandler(IllegalStateException e) {
+ return WVPResult.fail(ErrorCode.ERROR400);
+ }
+
/**
* 鑷畾涔夊紓甯稿鐞嗭紝 澶勭悊controller涓繑鍥炵殑閿欒
@@ -40,8 +51,8 @@
*/
@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);
}
/**
@@ -51,7 +62,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