From 273b282af6f74403a0b13d2694beb4b7f48edaf6 Mon Sep 17 00:00:00 2001
From: gaoxun250@sina.com <gaoxun250@sina.com>
Date: 星期五, 10 三月 2023 10:33:48 +0800
Subject: [PATCH] 防止回放空时报空指针
---
src/main/java/com/genersoft/iot/vmp/conf/GlobalExceptionHandler.java | 11 ++++++-----
1 files changed, 6 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..728afb9 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,7 @@
return WVPResult.fail(ErrorCode.ERROR500.getCode(), e.getMessage());
}
+
/**
* 鑷畾涔夊紓甯稿鐞嗭紝 澶勭悊controller涓繑鍥炵殑閿欒
* @param e 寮傚父
@@ -39,8 +40,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);
}
/**
@@ -50,7 +51,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