From e4b8d310d6ac4a0a25381debd37ad74716f91298 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 17:02:35 +0800
Subject: [PATCH] 新增必填项验证补充
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 118 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 36 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 32b98e2..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
@@ -7,11 +7,10 @@
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
-import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO;
-import com.gkhy.safePlatform.emergency.excepiton.EmergencyServiceException;
-import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO;
-import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO;
+import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+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;
@@ -27,6 +26,7 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Service("emergencyTeamService")
@@ -53,9 +53,9 @@
}
List<EmergencyTeamPageRespDTO> respList = new ArrayList<>();
- List<EmergencyTeamInfoPageDO> emergencyTeamInfoPageDOList = emergencyTeamInfoService.selectEmergencyTeamList(page,emergencyTeamDBQuery);
+ List<EmergencyTeamInfoPageDO> emergencyTeamInfoPageDOList = emergencyTeamInfoService.selectEmergencyTeamList(page, emergencyTeamDBQuery);
- if (!CollectionUtils.isEmpty(emergencyTeamInfoPageDOList)){
+ if (!CollectionUtils.isEmpty(emergencyTeamInfoPageDOList)) {
for (EmergencyTeamInfoPageDO emergencyTeamInfoPageDO : emergencyTeamInfoPageDOList) {
List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(emergencyTeamInfoPageDO.getId());
List<EmergencyTeamFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamFileInfoDOList, EmergencyTeamFileRespDTO.class);
@@ -74,68 +74,114 @@
page.getTotal(),
respList,
ResultCodes.OK
- );
+ );
}
@Override
public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+
//必填项验证
checkRequired(emergencyTeamReqDTO);
- //1.新增应急队伍
- EmergencyTeamFileInfoDO emergencyTeamFileInfoDO = new EmergencyTeamFileInfoDO();
- BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfoDO);
- emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfoDO);
- //2.新增应急队伍附件
- List<EmergencyTeamFileInfoDO> fileInfoDOList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoDOList.getClass());
- fileInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
- emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoDOList);
- //3.新增应急队伍人员
- List<EmergencyTeamMemberInfoDO> memberInfoDOList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoDOList.getClass());
- memberInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
- emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoDOList);
- return ResultVO.success();
+ Date nowDate = new Date();
+ //1.新增应急队伍
+ EmergencyTeamInfo emergencyTeamInfo = new EmergencyTeamInfo();
+ BeanUtils.copyProperties(emergencyTeamReqDTO, emergencyTeamInfo);
+ emergencyTeamInfo.setDelFlag(false);
+ emergencyTeamInfo.setCreateUid(uid);
+ emergencyTeamInfo.setGmtCreate(nowDate);
+ emergencyTeamInfoService.addEmergencyTeam(emergencyTeamInfo);
+ //2.新增应急队伍附件
+ List<EmergencyTeamFileInfo> fileInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(), EmergencyTeamFileInfo.class);
+ fileInfoList.forEach(EmergencyTeamFileInfo -> {
+ EmergencyTeamFileInfo.setTeamId(emergencyTeamInfo.getId());
+ EmergencyTeamFileInfo.setDelFlag(false);
+ EmergencyTeamFileInfo.setCreateUid(uid);
+ EmergencyTeamFileInfo.setGmtCreate(nowDate);
+ });
+ emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoList);
+ //3.新增应急队伍人员
+ List<EmergencyTeamMemberInfo> memberInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(), EmergencyTeamMemberInfo.class);
+ memberInfoList.forEach(EmergencyTeamMemberInfo -> {
+ EmergencyTeamMemberInfo.setTeamId(emergencyTeamInfo.getId());
+ EmergencyTeamMemberInfo.setDelFlag(false);
+ EmergencyTeamMemberInfo.setCreateUid(uid);
+ EmergencyTeamMemberInfo.setGmtCreate(nowDate);
+ });
+ emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoList);
+
+ return new ResultVO(ResultCodes.OK);
+ }
+
+ @Override
+ public ResultVO<EmergencyTeamPageRespDTO> getEmergencyTeamById(Long id) {
+ return null;
}
/**
* 验证必填项
+ *
* @return
*/
- private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO){
+ private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO) {
//名称
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())){
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_NAME_NULL);
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_NAME_NULL);
}
//级别
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())){
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_LEVEL_NULL);
}
//负责人
- if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalUid())){
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
+ if (emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
}
//负责人部门
- if(emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0){
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
+ if (emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
}
//负责人手机
- if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())){
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
}
//固定电话
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())){
- throw new EmergencyServiceException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())) {
+ 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);
+ }
+ }
}
}
/**
* 验证数据库是否存在
+ *
* @return
*/
- public Boolean checkeExist(){
+ public Boolean checkeExist() {
return null;
}
--
Gitblit v1.9.2