From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix

---
 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java
index 7e23d1d..56d1879 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java
@@ -5,6 +5,8 @@
 import com.gkhy.safePlatform.commons.exception.AusinessException;
 import com.gkhy.safePlatform.commons.exception.BusinessException;
 import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
+import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.AccessDeniedException;
@@ -19,6 +21,26 @@
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
+
+    /**
+     * 事故管理自定义异常
+     */
+    @ResponseBody
+    @ExceptionHandler(value = AccidentException.class)
+    public ResultVO AHandler(AccidentException e) {
+        logger.warn(e.getMessage());
+        return new ResultVO(e.getCode(),e.getMessage());
+    }
+
+    /**
+     * 应急预案自定义异常
+     */
+    @ResponseBody
+    @ExceptionHandler(value = EmergencyException.class)
+    public ResultVO AHandler(EmergencyException e) {
+        logger.warn(e.getMessage());
+        return new ResultVO(e.getCode(),e.getMessage());
+    }
 
     /**
      * 自定义异常
@@ -38,7 +60,7 @@
     @ExceptionHandler(value = BusinessException.class)
     public ResultVO AHandler(BusinessException e) {
         logger.warn(e.getMessage());
-        return new ResultVO(e.getError());
+        return new ResultVO(e.getCode(),e.getMessage());
     }
 
 
@@ -88,6 +110,9 @@
     public ResultVO errorHandler(Exception e) {
         e.printStackTrace();
         logger.error(e.getMessage());
-        return new ResultVO(ResultCodes.SERVER_ERROR);
+        ResultVO resultVO = new ResultVO<>();
+        resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
+        return resultVO;
+//        return new ResultVO(ResultCodes.SERVER_ERROR);
     }
 }

--
Gitblit v1.9.2