From 0991a1f9841091010f6bc114402dd61decd6b0f2 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 16:42:33 +0800
Subject: [PATCH] 自定义异常
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyException.java | 38 +++++++++++++++++++
/dev/null | 22 -----------
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/exception/GlobalExceptionHandler.java | 10 +++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 9 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java | 2 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 20 ++++++----
6 files changed, 70 insertions(+), 31 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
index 4bce8a1..2cac0c3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -33,7 +33,7 @@
}
/**
- * 新增应急队伍
+ * 应急队伍新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
public ResultVO addEmergencyTeam(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) {
@@ -41,4 +41,11 @@
return emergencyTeamService.addEmergencyTeam(Long.valueOf(uid), emergencyTeamReqDTO);
}
+ /**
+ * 应急队伍详情
+ */
+ @RequestMapping(value = "/detail",method = RequestMethod.GET)
+ public ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id){
+ return emergencyTeamService.getEmergencyTeamById(id);
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyException.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyException.java
new file mode 100644
index 0000000..5c2499e
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyException.java
@@ -0,0 +1,38 @@
+
+package com.gkhy.safePlatform.emergency.excepiton;
+
+import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+
+public class EmergencyException extends RuntimeException {
+ private String code;
+ private String message;
+
+ public EmergencyException(EmergencyResultCodes error) {
+ super(error.getDesc());
+ this.code = error.getCode();
+ this.message = error.getDesc();
+ }
+
+ public EmergencyException(String code, String message) {
+ super(message);
+ this.code = code;
+ this.message = message;
+ }
+
+ public String getCode() {
+ return this.code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
+
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyServiceException.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyServiceException.java
deleted file mode 100644
index 16897df..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyServiceException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-package com.gkhy.safePlatform.emergency.excepiton;
-
-import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
-
-public class EmergencyServiceException extends RuntimeException {
-
- private EmergencyResultCodes error;
-
- public EmergencyServiceException(EmergencyResultCodes error) {
- super(error.getDesc());
- this.error = error;
- }
-
- public EmergencyResultCodes getError() {
- return this.error;
- }
-
- public void setError(EmergencyResultCodes error) {
- this.error = error;
- }
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
index 6781368..9218633 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -14,4 +14,6 @@
SearchResultVO<List<EmergencyTeamPageRespDTO>> selectEmergencyTeamList(PageQuery<EmergencyTeamQuery> query);
ResultVO addEmergencyTeam(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO);
+
+ ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index 0a86114..bb72a4a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -8,9 +8,8 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
-import com.gkhy.safePlatform.emergency.excepiton.EmergencyServiceException;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
-import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamFileReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamPageRespDTO;
@@ -113,6 +112,11 @@
return new ResultVO(ResultCodes.OK);
}
+ @Override
+ public ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id) {
+ return null;
+ }
+
/**
* 验证必填项
*
@@ -121,28 +125,28 @@
private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO) {
//名称
if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())) {
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_NAME_NULL);
+ throw new EmergencyException(EmergencyResultCodes.TEAM_NAME_NULL);
}
//级别
if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
+ throw new EmergencyException(EmergencyResultCodes.TEAM_LEVEL_NULL);
}
//负责人
if (emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0) {
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
+ throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
}
//负责人部门
if (emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0) {
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
+ throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
}
//负责人手机
if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())) {
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
+ throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
}
//固定电话
if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())) {
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
+ throw new EmergencyException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
}
}
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 d145f4d..7f2c413 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,7 @@
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.AccessDeniedException;
@@ -19,6 +20,15 @@
private final Logger logger = LoggerFactory.getLogger(this.getClass());
+ /**
+ * 应急预案自定义异常
+ */
+ @ResponseBody
+ @ExceptionHandler(value = EmergencyException.class)
+ public ResultVO AHandler(EmergencyException e) {
+ logger.warn(e.getMessage());
+ return new ResultVO(e.getCode(),e.getMessage());
+ }
/**
* 自定义异常
--
Gitblit v1.9.2