From 260687df882672c651f5f668d932b0f31c328ba4 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 16:20:01 +0800
Subject: [PATCH] 应急队伍新增
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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 ba4fd5b..0a86114 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
@@ -10,6 +10,7 @@
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyServiceException;
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;
@@ -52,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);
@@ -73,82 +74,84 @@
page.getTotal(),
respList,
ResultCodes.OK
- );
+ );
}
@Override
public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
- Date nowDate = new Date();
+
//必填项验证
checkRequired(emergencyTeamReqDTO);
+
+ Date nowDate = new Date();
//1.新增应急队伍
- EmergencyTeamFileInfo emergencyTeamFileInfo = new EmergencyTeamFileInfo();
- BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfo);
- emergencyTeamFileInfo.setDelFlag(false);
- emergencyTeamFileInfo.setCreateUid(uid);
- emergencyTeamFileInfo.setGmtCreate(nowDate);
- emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfo);
+ EmergencyTeamInfo emergencyTeamInfo = new EmergencyTeamInfo();
+ BeanUtils.copyProperties(emergencyTeamReqDTO, emergencyTeamInfo);
+ emergencyTeamInfo.setDelFlag(false);
+ emergencyTeamInfo.setCreateUid(uid);
+ emergencyTeamInfo.setGmtCreate(nowDate);
+ emergencyTeamInfoService.addEmergencyTeam(emergencyTeamInfo);
//2.新增应急队伍附件
- List<EmergencyTeamFileInfo> fileInfoList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoList.getClass());
+ List<EmergencyTeamFileInfo> fileInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(), EmergencyTeamFileInfo.class);
fileInfoList.forEach(EmergencyTeamFileInfo -> {
- EmergencyTeamFileInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+ EmergencyTeamFileInfo.setTeamId(emergencyTeamInfo.getId());
EmergencyTeamFileInfo.setDelFlag(false);
EmergencyTeamFileInfo.setCreateUid(uid);
EmergencyTeamFileInfo.setGmtCreate(nowDate);
});
emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoList);
//3.新增应急队伍人员
- List<EmergencyTeamMemberInfo> memberInfoList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoList.getClass());
+ List<EmergencyTeamMemberInfo> memberInfoList = BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(), EmergencyTeamMemberInfo.class);
memberInfoList.forEach(EmergencyTeamMemberInfo -> {
- EmergencyTeamMemberInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+ EmergencyTeamMemberInfo.setTeamId(emergencyTeamInfo.getId());
EmergencyTeamMemberInfo.setDelFlag(false);
EmergencyTeamMemberInfo.setCreateUid(uid);
EmergencyTeamMemberInfo.setGmtCreate(nowDate);
});
emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoList);
- return ResultVO.success();
+ return new ResultVO(ResultCodes.OK);
}
/**
* 验证必填项
+ *
* @return
*/
- private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO){
+ private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO) {
//名称
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_NAME_NULL);
}
//级别
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
}
//负责人
- if(emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0){
+ if (emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
}
//负责人部门
- if(emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0){
+ if (emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
}
//负责人手机
- if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
}
//固定电话
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())){
+ if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())) {
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
}
}
/**
* 验证数据库是否存在
+ *
* @return
*/
- public Boolean checkeExist(){
+ public Boolean checkeExist() {
return null;
}
--
Gitblit v1.9.2