From 92edf51b040f057afa1fece88e0fbcd559baa27f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 05 七月 2022 11:32:49 +0800
Subject: [PATCH] 初始化运行
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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..5bc9aa3 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,10 +7,8 @@
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.entity.*;
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.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyTeamFileRespDTO;
@@ -27,6 +25,7 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Service("emergencyTeamService")
@@ -79,22 +78,33 @@
@Override
public ResultVO addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ Date nowDate = new Date();
//必填项验证
checkRequired(emergencyTeamReqDTO);
//1.新增应急队伍
- EmergencyTeamFileInfoDO emergencyTeamFileInfoDO = new EmergencyTeamFileInfoDO();
- BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfoDO);
- emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfoDO);
+ EmergencyTeamFileInfo emergencyTeamFileInfo = new EmergencyTeamFileInfo();
+ BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamFileInfo);
+ emergencyTeamFileInfo.setCreateUid(uid);
+ emergencyTeamFileInfo.setGmtCreate(nowDate);
+ emergencyTeamInfoService.addEmergencyTeam(emergencyTeamFileInfo);
//2.新增应急队伍附件
- List<EmergencyTeamFileInfoDO> fileInfoDOList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoDOList.getClass());
- fileInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
- emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoDOList);
+ List<EmergencyTeamFileInfo> fileInfoList = new ArrayList<>();
+ BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getFileList(),fileInfoList.getClass());
+ fileInfoList.forEach(EmergencyTeamFileInfo -> {
+ EmergencyTeamFileInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+ EmergencyTeamFileInfo.setCreateUid(uid);
+ EmergencyTeamFileInfo.setGmtCreate(nowDate);
+ });
+ emergencyTeamFileInfoService.addEmergencyTeamFile(fileInfoList);
//3.新增应急队伍人员
- List<EmergencyTeamMemberInfoDO> memberInfoDOList = new ArrayList<>();
- BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoDOList.getClass());
- memberInfoDOList.forEach(e->e.setTeamId(emergencyTeamFileInfoDO.getId()));
- emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoDOList);
+ List<EmergencyTeamMemberInfo> memberInfoList = new ArrayList<>();
+ BeanCopyUtils.copyBeanList(emergencyTeamReqDTO.getMemberList(),memberInfoList.getClass());
+ memberInfoList.forEach(EmergencyTeamMemberInfo -> {
+ EmergencyTeamMemberInfo.setTeamId(emergencyTeamFileInfo.getTeamId());
+ EmergencyTeamMemberInfo.setCreateUid(uid);
+ EmergencyTeamMemberInfo.setGmtCreate(nowDate);
+ });
+ emergencyTeamMemberInfoService.addEmergencyTeamMember(memberInfoList);
return ResultVO.success();
}
@@ -113,7 +123,7 @@
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL);
}
//负责人
- if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalUid())){
+ if(emergencyTeamReqDTO.getPrincipalUid() == null || emergencyTeamReqDTO.getPrincipalUid() == 0){
throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
}
//负责人部门
--
Gitblit v1.9.2