emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -33,12 +33,12 @@ } /** * 新增应急预案 * 新增应急队伍 */ @RequestMapping(value = "/add",method = RequestMethod.POST) public ResultVO<String> add(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) { public ResultVO addEmergencyTeam(Principal principal, @RequestBody EmergencyTeamReqDTO emergencyTeamReqDTO) { String uid = principal.getName(); return emergencyTeamService.add(Long.valueOf(uid), emergencyTeamReqDTO); return emergencyTeamService.addEmergencyTeam(Long.valueOf(uid), emergencyTeamReqDTO); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; import java.util.List; @TableName("emergency_team") public class EmergencyTeamInfoDetailDO { emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
对比新文件 @@ -0,0 +1,45 @@ package com.gkhy.safePlatform.emergency.enums; public enum EmergencyResultCodes { TEAM_NAME_NULL("T1001", "应急队伍名称不可为空"), TEAM_LEVEL_NULL("T1002", "应急队伍级别不可为空"), TEAM_PRINCIPAL_NULL("T1003", "应急队伍负责人不可为空"), TEAM_PRINCIPAL_DEPARTMENT_NULL("T1004", "应急队伍负责人部门不可为空"), TEAM_PRINCIPAL_PHONE_NULL("T1005", "应急队伍负责人手机不可为空"), TEAM_TELEPHONE_NUMBER_NULL("T1006", "应急队伍固定电话不可为空"), ERROR("A3000", "未知错误"); private String code; private String desc; private EmergencyResultCodes(String code, String desc) { this.code = code; this.desc = desc; } public String getCode() { return this.code; } public void setCode(String code) { this.code = code; } public String getDesc() { return this.desc; } public void setDesc(String desc) { this.desc = desc; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/excepiton/EmergencyServiceException.java
对比新文件 @@ -0,0 +1,22 @@ 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; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamFileReqDTO.java
对比新文件 @@ -0,0 +1,56 @@ package com.gkhy.safePlatform.emergency.model.dto.req; public class EmergencyTeamFileReqDTO { private Long id; private Long teamId; private String fileUrl; private String fileName; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Long getTeamId() { return teamId; } public void setTeamId(Long teamId) { this.teamId = teamId; } public String getFileUrl() { return fileUrl; } public void setFileUrl(String fileUrl) { this.fileUrl = fileUrl; } public String getFileName() { return fileName; } public void setFileName(String fileName) { this.fileName = fileName; } @Override public String toString() { return "EmergencyTeamFileInfo{" + "id=" + id + ", teamId=" + teamId + ", fileUrl='" + fileUrl + '\'' + ", fileName='" + fileName + '\'' + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
对比新文件 @@ -0,0 +1,99 @@ package com.gkhy.safePlatform.emergency.model.dto.req; public class EmergencyTeamMemberReqDTO { private Long id; private Long teamId; private String userUid; private Byte gender; private String jobNumber; private String name; private String phone; private String position; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Long getTeamId() { return teamId; } public void setTeamId(Long teamId) { this.teamId = teamId; } public String getUserUid() { return userUid; } public void setUserUid(String userUid) { this.userUid = userUid; } public Byte getGender() { return gender; } public void setGender(Byte gender) { this.gender = gender; } public String getJobNumber() { return jobNumber; } public void setJobNumber(String jobNumber) { this.jobNumber = jobNumber; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getPhone() { return phone; } public void setPhone(String phone) { this.phone = phone; } public String getPosition() { return position; } public void setPosition(String position) { this.position = position; } @Override public String toString() { return "EmergencyTeamMemberReqDTO{" + "id=" + id + ", teamId=" + teamId + ", userUid='" + userUid + '\'' + ", gender=" + gender + ", jobNumber='" + jobNumber + '\'' + ", name='" + name + '\'' + ", phone='" + phone + '\'' + ", position='" + position + '\'' + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
@@ -1,4 +1,122 @@ package com.gkhy.safePlatform.emergency.model.dto.req; import java.util.List; public class EmergencyTeamReqDTO { private Long id; private String principalUid; private Long principalDepartmentId; private String teamLevel; private String teamName; private String principalPhone; private String telephoneNumber; private String teamDesc; private List<EmergencyTeamFileReqDTO> fileList; private List<EmergencyTeamMemberReqDTO> MemberList; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getPrincipalUid() { return principalUid; } public void setPrincipalUid(String principalUid) { this.principalUid = principalUid; } public Long getPrincipalDepartmentId() { return principalDepartmentId; } public void setPrincipalDepartmentId(Long principalDepartmentId) { this.principalDepartmentId = principalDepartmentId; } public String getTeamLevel() { return teamLevel; } public void setTeamLevel(String teamLevel) { this.teamLevel = teamLevel; } public String getTeamName() { return teamName; } public void setTeamName(String teamName) { this.teamName = teamName; } public String getPrincipalPhone() { return principalPhone; } public void setPrincipalPhone(String principalPhone) { this.principalPhone = principalPhone; } public String getTelephoneNumber() { return telephoneNumber; } public void setTelephoneNumber(String telephoneNumber) { this.telephoneNumber = telephoneNumber; } public String getTeamDesc() { return teamDesc; } public void setTeamDesc(String teamDesc) { this.teamDesc = teamDesc; } public List<EmergencyTeamFileReqDTO> getFileList() { return fileList; } public void setFileList(List<EmergencyTeamFileReqDTO> fileList) { this.fileList = fileList; } public List<EmergencyTeamMemberReqDTO> getMemberList() { return MemberList; } public void setMemberList(List<EmergencyTeamMemberReqDTO> memberList) { MemberList = memberList; } @Override public String toString() { return "EmergencyTeamReqDTO{" + "id=" + id + ", principalUid='" + principalUid + '\'' + ", principalDepartmentId=" + principalDepartmentId + ", teamLevel='" + teamLevel + '\'' + ", teamName='" + teamName + '\'' + ", principalPhone='" + principalPhone + '\'' + ", telephoneNumber='" + telephoneNumber + '\'' + ", teamDesc='" + teamDesc + '\'' + ", fileList=" + fileList + ", MemberList=" + MemberList + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
对比新文件 @@ -0,0 +1,77 @@ package com.gkhy.safePlatform.emergency.model.dto.resp; import java.util.List; public class EmergencyTeamDetailRespDTO { private Long id; private String teamLevel; private String teamName; private String principalPhone; private String teamDesc; private List<EmergencyTeamFileRespDTO> fileList; private List<EmergencyTeamMemberRespDTO> memberList; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public String getTeamLevel() { return teamLevel; } public void setTeamLevel(String teamLevel) { this.teamLevel = teamLevel; } public String getTeamName() { return teamName; } public void setTeamName(String teamName) { this.teamName = teamName; } public String getPrincipalPhone() { return principalPhone; } public void setPrincipalPhone(String principalPhone) { this.principalPhone = principalPhone; } public String getTeamDesc() { return teamDesc; } public void setTeamDesc(String teamDesc) { this.teamDesc = teamDesc; } public List<EmergencyTeamFileRespDTO> getFileList() { return fileList; } public void setFileList(List<EmergencyTeamFileRespDTO> fileList) { this.fileList = fileList; } public List<EmergencyTeamMemberRespDTO> getMemberList() { return memberList; } public void setMemberList(List<EmergencyTeamMemberRespDTO> memberList) { this.memberList = memberList; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java
对比新文件 @@ -0,0 +1,99 @@ package com.gkhy.safePlatform.emergency.model.dto.resp; public class EmergencyTeamMemberRespDTO { private Long id; private Long teamId; private String userUid; private Byte gender; private String jobNumber; private String name; private String phone; private String position; public Long getId() { return id; } public void setId(Long id) { this.id = id; } public Long getTeamId() { return teamId; } public void setTeamId(Long teamId) { this.teamId = teamId; } public String getUserUid() { return userUid; } public void setUserUid(String userUid) { this.userUid = userUid; } public Byte getGender() { return gender; } public void setGender(Byte gender) { this.gender = gender; } public String getJobNumber() { return jobNumber; } public void setJobNumber(String jobNumber) { this.jobNumber = jobNumber; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getPhone() { return phone; } public void setPhone(String phone) { this.phone = phone; } public String getPosition() { return position; } public void setPosition(String position) { this.position = position; } @Override public String toString() { return "EmergencyTeamMemberReqDTO{" + "id=" + id + ", teamId=" + teamId + ", userUid='" + userUid + '\'' + ", gender=" + gender + ", jobNumber='" + jobNumber + '\'' + ", name='" + name + '\'' + ", phone='" + phone + '\'' + ", position='" + position + '\'' + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java
@@ -2,31 +2,31 @@ public class EmergencyTeamQuery { private String team_name ; private String teamName ; private String team_level ; private String teamLevel ; public String getTeam_name() { return team_name; public String getTeamName() { return teamName; } public void setTeam_name(String team_name) { this.team_name = team_name; public void setTeamName(String teamName) { this.teamName = teamName; } public String getTeam_level() { return team_level; public String getTeamLevel() { return teamLevel; } public void setTeam_level(String team_level) { this.team_level = team_level; public void setTeamLevel(String teamLevel) { this.teamLevel = teamLevel; } @Override public String toString() { return "EmergencyTeamDBQuery{" + "team_name='" + team_name + '\'' + ", team_level='" + team_level + '\'' + "teamName='" + teamName + '\'' + ", teamLevel='" + teamLevel + '\'' + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java
@@ -2,31 +2,31 @@ public class EmergencyTeamDBQuery { private String team_name ; private String teamName ; private String team_level ; private String teamLevel ; public String getTeam_name() { return team_name; public String getTeamName() { return teamName; } public void setTeam_name(String team_name) { this.team_name = team_name; public void setTeamName(String teamName) { this.teamName = teamName; } public String getTeam_level() { return team_level; public String getTeamLevel() { return teamLevel; } public void setTeam_level(String team_level) { this.team_level = team_level; public void setTeamLevel(String teamLevel) { this.teamLevel = teamLevel; } @Override public String toString() { return "EmergencyTeamDBQuery{" + "team_name='" + team_name + '\'' + ", team_level='" + team_level + '\'' + "teamName='" + teamName + '\'' + ", teamLevel='" + teamLevel + '\'' + '}'; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamFileInfoRepository.java
@@ -1,10 +1,17 @@ package com.gkhy.safePlatform.emergency.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; import org.springframework.stereotype.Repository; import java.util.List; @Repository public interface EmergencyTeamFileInfoRepository extends BaseMapper<EmergencyTeamFileInfoDO> { public interface EmergencyTeamFileInfoRepository extends BaseMapper<EmergencyTeamFileInfo> { List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id); void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamInfoRepository.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; @@ -15,4 +16,5 @@ List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, @Param("query") EmergencyTeamDBQuery emergencyTeamDBQuery); void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyTeamMemberInfoRepository.java
对比新文件 @@ -0,0 +1,14 @@ package com.gkhy.safePlatform.emergency.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO; import org.springframework.stereotype.Repository; import java.util.List; @Repository public interface EmergencyTeamMemberInfoRepository extends BaseMapper<EmergencyTeamMemberInfo> { void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -13,5 +13,5 @@ SearchResultVO<List<EmergencyTeamPageRespDTO>> selectEmergencyTeamList(PageQuery<EmergencyTeamQuery> query); ResultVO<String> add(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO); ResultVO addEmergencyTeam(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamFileInfoService.java
@@ -1,12 +1,15 @@ package com.gkhy.safePlatform.emergency.service.baseService; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; import java.util.List; public interface EmergencyTeamFileInfoService extends IService<EmergencyTeamFileInfoDO> { public interface EmergencyTeamFileInfoService extends IService<EmergencyTeamFileInfo> { List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id); void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamInfoService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; @@ -12,4 +13,6 @@ public interface EmergencyTeamInfoService extends IService<EmergencyTeamInfo> { List<EmergencyTeamInfoPageDO> selectEmergencyTeamList(Page<EmergencyTeamInfoPageDO> page, EmergencyTeamDBQuery emergencyTeamDBQuery); void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyTeamMemberInfoService.java
对比新文件 @@ -0,0 +1,14 @@ package com.gkhy.safePlatform.emergency.service.baseService; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO; import java.util.List; public interface EmergencyTeamMemberInfoService extends IService<EmergencyTeamMemberInfo> { void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamFileInfoServiceImpl.java
@@ -1,17 +1,19 @@ package com.gkhy.safePlatform.emergency.service.baseService.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; import com.gkhy.safePlatform.emergency.repository.EmergencyTeamFileInfoRepository; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamFileInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; @Service("emergencyTeamFileInfoService") public class EmergencyTeamFileInfoServiceImpl extends ServiceImpl<EmergencyTeamFileInfoRepository, EmergencyTeamFileInfoDO> implements EmergencyTeamFileInfoService { public class EmergencyTeamFileInfoServiceImpl extends ServiceImpl<EmergencyTeamFileInfoRepository, EmergencyTeamFileInfo> implements EmergencyTeamFileInfoService { @Autowired private EmergencyTeamFileInfoRepository emergencyTeamFileInfoRepository; @@ -19,11 +21,14 @@ @Override public List<EmergencyTeamFileInfoDO> selectByEmergencyTeamId(Long id) { QueryWrapper<EmergencyTeamFileInfoDO> wrapper = new QueryWrapper<>(); wrapper.eq("team_id",id); List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList= emergencyTeamFileInfoRepository.selectList(wrapper); return emergencyTeamFileInfoDOList; List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList= emergencyTeamFileInfoRepository.selectByEmergencyTeamId(id); return CollectionUtils.isEmpty(emergencyTeamFileInfoDOList)?new ArrayList<>():emergencyTeamFileInfoDOList; } @Override public void addEmergencyTeamFile(List<EmergencyTeamFileInfoDO> fileList) { emergencyTeamFileInfoRepository.addEmergencyTeamFile(fileList); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamInfoServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamFileInfoDO; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyTeamDBQuery; @@ -23,6 +24,10 @@ return emergencyTeamInfoRepository.selectEmergencyTeamList(page,emergencyTeamDBQuery); } @Override public void addEmergencyTeam(EmergencyTeamFileInfoDO emergencyTeamFileInfoDO) { emergencyTeamInfoRepository.addEmergencyTeam(emergencyTeamFileInfoDO); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyTeamMemberInfoServiceImpl.java
对比新文件 @@ -0,0 +1,24 @@ package com.gkhy.safePlatform.emergency.service.baseService.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyTeamMemberInfoDO; import com.gkhy.safePlatform.emergency.repository.EmergencyTeamMemberInfoRepository; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamMemberInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service("emergencyTeamMemberInfoService") public class EmergencyTeamMemberInfoServiceImpl extends ServiceImpl<EmergencyTeamMemberInfoRepository, EmergencyTeamMemberInfo> implements EmergencyTeamMemberInfoService { @Autowired private EmergencyTeamMemberInfoRepository emergencyTeamMemberInfoRepository; @Override public void addEmergencyTeamMember(List<EmergencyTeamMemberInfoDO> memberList) { emergencyTeamMemberInfoRepository.addEmergencyTeamMember(memberList); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -4,11 +4,14 @@ import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; 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.EmergencyTeamFileInfo; 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.enums.EmergencyResultCodes; 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; @@ -17,6 +20,7 @@ import com.gkhy.safePlatform.emergency.service.EmergencyTeamService; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamFileInfoService; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamInfoService; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyTeamMemberInfoService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +38,9 @@ @Autowired private EmergencyTeamFileInfoService emergencyTeamFileInfoService; @Autowired private EmergencyTeamMemberInfoService emergencyTeamMemberInfoService; @Override public SearchResultVO<List<EmergencyTeamPageRespDTO>> selectEmergencyTeamList(PageQuery<EmergencyTeamQuery> query) { Long pageIndex = query.getPageIndex(); @@ -49,12 +56,12 @@ List<EmergencyTeamInfoPageDO> emergencyTeamInfoPageDOList = emergencyTeamInfoService.selectEmergencyTeamList(page,emergencyTeamDBQuery); if (!CollectionUtils.isEmpty(emergencyTeamInfoPageDOList)){ for (int i = 0 ; i < emergencyTeamInfoPageDOList.size() ; i++){ List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(emergencyTeamInfoPageDOList.get(i).getId()); for (EmergencyTeamInfoPageDO emergencyTeamInfoPageDO : emergencyTeamInfoPageDOList) { List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(emergencyTeamInfoPageDO.getId()); List<EmergencyTeamFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyTeamFileInfoDOList, EmergencyTeamFileRespDTO.class); EmergencyTeamPageRespDTO emergencyTeamPageRespDTO = new EmergencyTeamPageRespDTO(); BeanUtils.copyProperties(emergencyTeamInfoPageDOList.get(i),emergencyTeamPageRespDTO); BeanUtils.copyProperties(emergencyTeamInfoPageDO, emergencyTeamPageRespDTO); emergencyTeamPageRespDTO.setFileList(emergencyTeamFileRespDTOList); respList.add(emergencyTeamPageRespDTO); } @@ -71,10 +78,65 @@ } @Override public ResultVO<String> add(Long valueOf, EmergencyTeamReqDTO emergencyTeamReqDTO) { //新增应急预案 //新增应急预案使用部门表 // 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(); } /** * 验证必填项 * @return */ private void checkRequired(EmergencyTeamReqDTO emergencyTeamReqDTO){ //名称 if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamName())){ throw new EmergencyServiceException(EmergencyResultCodes.TEAM_NAME_NULL); } //级别 if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())){ throw new EmergencyServiceException(EmergencyResultCodes.TEAM_LEVEL_NULL); } //负责人 if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalUid())){ throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL); } //负责人部门 if(emergencyTeamReqDTO.getPrincipalDepartmentId() == null || emergencyTeamReqDTO.getPrincipalDepartmentId() == 0){ throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL); } //负责人手机 if (StringUtils.isBlank(emergencyTeamReqDTO.getPrincipalPhone())){ throw new EmergencyServiceException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL); } //固定电话 if (StringUtils.isBlank(emergencyTeamReqDTO.getTelephoneNumber())){ throw new EmergencyServiceException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL); } } /** * 验证数据库是否存在 * @return */ public Boolean checkeExist(){ return null; } }