From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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..cce9141 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,11 +5,15 @@
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.equipment.excepiton.EquipmentException;
+import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.AuthenticationException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -19,6 +23,35 @@
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());
+ }
+ /**
+ * 设备自定义异常
+ */
+ @ResponseBody
+ @ExceptionHandler(value = EquipmentException.class)
+ public ResultVO AHandler(EquipmentException e) {
+ logger.warn(e.getMessage());
+ return new ResultVO(e.getCode(),e.getMessage());
+ }
/**
* 自定义异常
@@ -38,7 +71,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 +121,20 @@
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);
+ }
+ /**
+ * 处理入参异常
+ * @param e
+ * @return
+ */
+ @ResponseBody
+ @ExceptionHandler(MethodArgumentNotValidException.class)
+ public ResultVO handleMethodArgumentNotValidException(MethodArgumentNotValidException e){
+ logger.warn(e.getBindingResult().getFieldError().getDefaultMessage());
+ return new ResultVO(ResultCodes.SERVER_PARAM_NULL.getCode(),e.getBindingResult().getFieldError().getDefaultMessage());
}
}
--
Gitblit v1.9.2