From e4b8d310d6ac4a0a25381debd37ad74716f91298 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 05 Jul 2022 17:02:35 +0800
Subject: [PATCH] 新增必填项验证补充
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
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..acb7313 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,9 @@
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.EmergencyTeamMemberReqDTO;
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 +113,11 @@
return new ResultVO(ResultCodes.OK);
}
+ @Override
+ public ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id) {
+ return null;
+ }
+
/**
* 验证必填项
*
@@ -121,28 +126,53 @@
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);
+ }
+ //人员列表如果不为空，则需要验证其中的必填项
+ if (!CollectionUtils.isEmpty(emergencyTeamReqDTO.getMemberList())){
+ for(EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO : emergencyTeamReqDTO.getMemberList()){
+ //工号
+ if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getJobNumber())) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_JOB_NUMBER_NULL);
+ }
+ //名称
+ if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getName())) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_NAME_NULL);
+ }
+ //性别
+ if (emergencyTeamMemberReqDTO.getGender()==null) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_GENDER_NULL);
+ }
+ //手机号码
+ if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getPhone())) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_PHONE_NULL);
+ }
+ //职务
+ if (StringUtils.isBlank(emergencyTeamMemberReqDTO.getPosition())) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_USER_POSITION_NULL);
+ }
+ }
}
}
--
Gitblit v1.9.2