emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -46,4 +46,21 @@ public ResultVO<EmergencyPlanDetailRespDTO> getEmergencyPlanById(@PathVariable("id")Long id){ return emergencyPlanService.getEmergencyPlanById(id); } /** * 应急预案修改 */ @RequestMapping(value = "/update",method = RequestMethod.POST) public ResultVO updateEmergencyPlan(Principal principal, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) { String uid = principal.getName(); return emergencyPlanService.updateEmergencyPlan(Long.valueOf(uid), emergencyPlanReqDTO); } /** * 应急预案删除/批量删除 */ @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET) public ResultVO batchDeleteEmergencyPlan(@PathVariable("ids")String ids){ return emergencyPlanService.batchDeleteEmergencyPlan(ids); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -58,16 +58,7 @@ } /** * 应急队伍删除 */ @RequestMapping(value = "/delete/{id}",method = RequestMethod.GET) public ResultVO deleteEmergencyTeam(@PathVariable("id")Long id){ return emergencyTeamService.deleteEmergencyTeam(id); } /** * 应急队伍批量删除 * 应急队伍删除/批量删除 */ @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET) public ResultVO batchDeleteEmergencyTeam(@PathVariable("ids")String ids){ emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanAreaInfoRepository.java
@@ -15,4 +15,8 @@ void addEmergencyPlanArea(EmergencyPlanAreaInfo emergencyPlanAreaInfo); List<EmergencyPlanAreaInfoDO> selectEmergencyPlanAreaByPlanId(@Param("planId") Long planId); void deleteEmergencyPlanAreaByIds(List<Long> ids); void deleteEmergencyPlanAreaByPlanId(@Param("planId")Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanDepartmentInfoRepository.java
@@ -15,4 +15,8 @@ void addEmergencyPlanDepartment(EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo); List<EmergencyPlanDepartmentInfoDO> selectEmergencyPlanDepartmentByPlanId(@Param("planId") Long planId); void deleteEmergencyPlanDepartmentByIds(List<Long> ids); void deleteEmergencyPlanDepartmentByPlanId(@Param("planId")Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanFileInfoRepository.java
@@ -15,4 +15,9 @@ void addEmergencyPlanFile(EmergencyPlanFileInfo emergencyPlanFileInfo); List<EmergencyPlanFileInfoDO> selectEmergencyPlanFileByPlanId(@Param("planId") Long planId); void deleteEmergencyPlanFileByIds(List<Long> ids); void deleteEmergencyPlanFileByPlanId(@Param("planId")Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java
@@ -20,4 +20,6 @@ void addEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo); EmergencyPlanInfoDetailDO selectEmergencyPlanById(@Param("id") Long id); void updateEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanTeamInfoRepository.java
@@ -15,4 +15,8 @@ void addEmergencyPlanTeam(EmergencyPlanTeamInfo emergencyPlanTeamInfo); List<EmergencyPlanTeamInfoDO> selectEmergencyPlanTeamByPlanId(@Param("planId") Long planId); void deleteEmergencyPlanTeamByIds(List<Long> ids); void deleteEmergencyPlanTeamByPlanId(@Param("planId")Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java
@@ -17,4 +17,8 @@ ResultVO addEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO); ResultVO<EmergencyPlanDetailRespDTO> getEmergencyPlanById(Long id); ResultVO updateEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO); ResultVO batchDeleteEmergencyPlan(String ids); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -25,8 +25,6 @@ ResultVO updateEmergencyTeamMember(Long valueOf, EmergencyTeamMemberReqDTO emergencyTeamMemberReqDTO); ResultVO deleteEmergencyTeam(Long id); ResultVO deleteEmergencyTeamMember(Long id); ResultVO getEmergencyTeamMemberById(Long id); emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanAreaInfoService.java
@@ -12,4 +12,8 @@ void addEmergencyPlanArea(EmergencyPlanAreaInfo emergencyPlanAreaInfo); List<EmergencyPlanAreaInfoDO> selectEmergencyPlanAreaByPlanId(Long id); void deleteEmergencyPlanAreaByIds(List<Long> deleteList); void deleteEmergencyPlanAreaByPlanId(Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanDepartmentInfoService.java
@@ -12,4 +12,8 @@ void addEmergencyPlanDepartment(EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo); List<EmergencyPlanDepartmentInfoDO> selectEmergencyPlanDepartmentByPlanId(Long id); void deleteEmergencyPlanDepartmentByIds(List<Long> deleteList); void deleteEmergencyPlanDepartmentByPlanId(Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanFileInfoService.java
@@ -12,4 +12,8 @@ void addEmergencyPlanFile(EmergencyPlanFileInfo emergencyPlanFileInfo); List<EmergencyPlanFileInfoDO> selectEmergencyPlanFileByPlanId(Long id); void deleteEmergencyPlanFileByIds(List<Long> deleteList); void deleteEmergencyPlanFileByPlanId(Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java
@@ -17,4 +17,6 @@ void addEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo); EmergencyPlanInfoDetailDO selectEmergencyPlanById(Long id); void updateEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanTeamInfoService.java
@@ -12,4 +12,8 @@ void addEmergencyPlanTeam(EmergencyPlanTeamInfo emergencyPlanTeamInfo); List<EmergencyPlanTeamInfoDO> selectEmergencyPlanTeamByPlanId(Long id); void deleteEmergencyPlanTeamByIds(List<Long> deleteList); void deleteEmergencyPlanTeamByPlanId(Long planId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanAreaInfoServiceImpl.java
@@ -28,4 +28,14 @@ return emergencyPlanAreaInfoRepository.selectEmergencyPlanAreaByPlanId(id); } @Override public void deleteEmergencyPlanAreaByIds(List<Long> ids) { emergencyPlanAreaInfoRepository.deleteEmergencyPlanAreaByIds(ids); } @Override public void deleteEmergencyPlanAreaByPlanId(Long planId) { emergencyPlanAreaInfoRepository.deleteEmergencyPlanAreaByPlanId(planId); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanDepartmentInfoServiceImpl.java
@@ -27,4 +27,14 @@ return emergencyPlanDepartmentInfoRepository.selectEmergencyPlanDepartmentByPlanId(id); } @Override public void deleteEmergencyPlanDepartmentByIds(List<Long> ids) { emergencyPlanDepartmentInfoRepository.deleteEmergencyPlanDepartmentByIds(ids); } @Override public void deleteEmergencyPlanDepartmentByPlanId(Long planId) { emergencyPlanDepartmentInfoRepository.deleteEmergencyPlanDepartmentByPlanId(planId); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanFileInfoServiceImpl.java
@@ -27,4 +27,14 @@ return emergencyPlanFileInfoRepository.selectEmergencyPlanFileByPlanId(id); } @Override public void deleteEmergencyPlanFileByIds(List<Long> ids) { emergencyPlanFileInfoRepository.deleteEmergencyPlanFileByIds(ids); } @Override public void deleteEmergencyPlanFileByPlanId(Long planId) { emergencyPlanFileInfoRepository.deleteEmergencyPlanFileByPlanId(planId); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanInfoServiceImpl.java
@@ -34,5 +34,10 @@ return emergencyPlanInfoRepository.selectEmergencyPlanById(id); } @Override public void updateEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo) { emergencyPlanInfoRepository.updateEmergencyPlan(emergencyPlanInfo); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanTeamInfoServiceImpl.java
@@ -26,4 +26,14 @@ public List<EmergencyPlanTeamInfoDO> selectEmergencyPlanTeamByPlanId(Long id) { return emergencyPlanTeamInfoRepository.selectEmergencyPlanTeamByPlanId(id); } @Override public void deleteEmergencyPlanTeamByIds(List<Long> ids) { emergencyPlanTeamInfoRepository.deleteEmergencyPlanTeamByIds(ids); } @Override public void deleteEmergencyPlanTeamByPlanId(Long planId) { emergencyPlanTeamInfoRepository.deleteEmergencyPlanTeamByPlanId(planId); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -4,13 +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.*; import com.gkhy.safePlatform.emergency.enums.EmergencyPlanStatus; import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes; import com.gkhy.safePlatform.emergency.excepiton.EmergencyException; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyPlanReqDTO; import com.gkhy.safePlatform.emergency.model.dto.req.*; import com.gkhy.safePlatform.emergency.model.dto.resp.*; import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery; import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery; @@ -21,8 +22,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Service("emergencyPlanService") public class EmergencyPlanServiceImpl implements EmergencyPlanService { @@ -78,58 +81,74 @@ emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo); // 新增应急预案区域表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())){ List<EmergencyPlanAreaInfo> emergencyPlanAreaInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getAreaList(),EmergencyPlanAreaInfo.class); emergencyPlanAreaInfoList.forEach(EmergencyPlanAreaInfo->{ EmergencyPlanAreaInfo.setDelFlag(false); EmergencyPlanAreaInfo.setCreateUid(uid); EmergencyPlanAreaInfo.setGmtCreate(nowDate); EmergencyPlanAreaInfo.setPlanId(emergencyPlanInfo.getId()); }); for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : emergencyPlanAreaInfoList){ emergencyPlanAreaInfoService.addEmergencyPlanArea(emergencyPlanAreaInfo); } addEmergencyPlanArea(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getAreaList()); } // 新增应急预案适用部门表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getDeptList())){ List<EmergencyPlanDepartmentInfo> emergencyPlanDepartmentInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getDeptList(),EmergencyPlanDepartmentInfo.class); emergencyPlanDepartmentInfoList.forEach(EmergencyPlanDepartmentInfo->{ EmergencyPlanDepartmentInfo.setDelFlag(false); EmergencyPlanDepartmentInfo.setCreateUid(uid); EmergencyPlanDepartmentInfo.setGmtCreate(nowDate); EmergencyPlanDepartmentInfo.setPlanId(emergencyPlanInfo.getId()); }); for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : emergencyPlanDepartmentInfoList){ emergencyPlanDepartmentInfoService.addEmergencyPlanDepartment(emergencyPlanDepartmentInfo); } addEmergencyPlanDepartment(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getDeptList()); } // 新增应急预案附件表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getFileList())){ List<EmergencyPlanFileInfo> emergencyPlanFileInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getFileList(),EmergencyPlanFileInfo.class); emergencyPlanFileInfoList.forEach(EmergencyPlanFileInfo->{ EmergencyPlanFileInfo.setDelFlag(false); EmergencyPlanFileInfo.setCreateUid(uid); EmergencyPlanFileInfo.setGmtCreate(nowDate); EmergencyPlanFileInfo.setPlanId(emergencyPlanInfo.getId()); }); for (EmergencyPlanFileInfo emergencyPlanFileInfo : emergencyPlanFileInfoList){ emergencyPlanFileInfoService.addEmergencyPlanFile(emergencyPlanFileInfo); } addEmergencyPlanFile(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getFileList()); } // 新增应急预案应急队伍表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getTeamList())){ List<EmergencyPlanTeamInfo> emergencyPlanTeamInfoList = BeanCopyUtils.copyBeanList(emergencyPlanReqDTO.getTeamList(),EmergencyPlanTeamInfo.class); emergencyPlanTeamInfoList.forEach(EmergencyPlanTeamInfo->{ EmergencyPlanTeamInfo.setDelFlag(false); EmergencyPlanTeamInfo.setCreateUid(uid); EmergencyPlanTeamInfo.setGmtCreate(nowDate); EmergencyPlanTeamInfo.setPlanId(emergencyPlanInfo.getId()); }); for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : emergencyPlanTeamInfoList){ emergencyPlanTeamInfoService.addEmergencyPlanTeam(emergencyPlanTeamInfo); } addEmergencyPlanTeam(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getTeamList()); } return new ResultVO<>(ResultCodes.OK); } private void addEmergencyPlanArea(Long uid,Long planId, Date nowDate,List<EmergencyPlanAreaReqDTO> emergencyPlanAreaReqDTOList){ List<EmergencyPlanAreaInfo> emergencyPlanAreaInfoList = BeanCopyUtils.copyBeanList(emergencyPlanAreaReqDTOList,EmergencyPlanAreaInfo.class); emergencyPlanAreaInfoList.forEach(EmergencyPlanAreaInfo->{ EmergencyPlanAreaInfo.setDelFlag(false); EmergencyPlanAreaInfo.setCreateUid(uid); EmergencyPlanAreaInfo.setGmtCreate(nowDate); EmergencyPlanAreaInfo.setPlanId(planId); }); for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : emergencyPlanAreaInfoList){ emergencyPlanAreaInfoService.addEmergencyPlanArea(emergencyPlanAreaInfo); } } private void addEmergencyPlanDepartment(Long uid,Long planId, Date nowDate,List<EmergencyPlanDepartmentReqDTO> emergencyPlanDepartmentReqDTOList){ List<EmergencyPlanDepartmentInfo> emergencyPlanDepartmentInfoList = BeanCopyUtils.copyBeanList(emergencyPlanDepartmentReqDTOList,EmergencyPlanDepartmentInfo.class); emergencyPlanDepartmentInfoList.forEach(EmergencyPlanDepartmentInfo->{ EmergencyPlanDepartmentInfo.setDelFlag(false); EmergencyPlanDepartmentInfo.setCreateUid(uid); EmergencyPlanDepartmentInfo.setGmtCreate(nowDate); EmergencyPlanDepartmentInfo.setPlanId(planId); }); for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : emergencyPlanDepartmentInfoList){ emergencyPlanDepartmentInfoService.addEmergencyPlanDepartment(emergencyPlanDepartmentInfo); } } private void addEmergencyPlanFile(Long uid,Long planId, Date nowDate,List<EmergencyPlanFileReqDTO> emergencyPlanFileReqDTOList){ List<EmergencyPlanFileInfo> emergencyPlanFileInfoList = BeanCopyUtils.copyBeanList(emergencyPlanFileReqDTOList,EmergencyPlanFileInfo.class); emergencyPlanFileInfoList.forEach(EmergencyPlanFileInfo->{ EmergencyPlanFileInfo.setDelFlag(false); EmergencyPlanFileInfo.setCreateUid(uid); EmergencyPlanFileInfo.setGmtCreate(nowDate); EmergencyPlanFileInfo.setPlanId(planId); }); for (EmergencyPlanFileInfo emergencyPlanFileInfo : emergencyPlanFileInfoList){ emergencyPlanFileInfoService.addEmergencyPlanFile(emergencyPlanFileInfo); } } private void addEmergencyPlanTeam(Long uid,Long planId, Date nowDate,List<EmergencyPlanTeamReqDTO> emergencyPlanTeamReqDTOList){ List<EmergencyPlanTeamInfo> emergencyPlanTeamInfoList = BeanCopyUtils.copyBeanList(emergencyPlanTeamReqDTOList,EmergencyPlanTeamInfo.class); emergencyPlanTeamInfoList.forEach(EmergencyPlanTeamInfo->{ EmergencyPlanTeamInfo.setDelFlag(false); EmergencyPlanTeamInfo.setCreateUid(uid); EmergencyPlanTeamInfo.setGmtCreate(nowDate); EmergencyPlanTeamInfo.setPlanId(planId); }); for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : emergencyPlanTeamInfoList){ emergencyPlanTeamInfoService.addEmergencyPlanTeam(emergencyPlanTeamInfo); } } @Override @@ -169,4 +188,230 @@ return new ResultVO<>(ResultCodes.OK,emergencyPlanDetailRespDTO); } } @Override public ResultVO updateEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO) { Date nowDate = new Date(); // 查询是否存在 EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(emergencyPlanReqDTO.getId()); if (emergencyPlanInfoDetailDO==null){ throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST); }else{ EmergencyPlanInfo emergencyPlanInfo = new EmergencyPlanInfo(); BeanUtils.copyProperties(emergencyPlanReqDTO,emergencyPlanInfo); emergencyPlanInfo.setUpdateUid(uid); emergencyPlanInfo.setGmtModitify(new Date()); emergencyPlanInfoService.updateEmergencyPlan(emergencyPlanInfo); // 更新应急预案区域表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())){ updateEmergencyPlanArea(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getAreaList()); } // 更新应急预案适用部门表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getDeptList())){ updateEmergencyPlanDepartment(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getDeptList()); } // 更新应急预案附件表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getFileList())){ updateEmergencyPlanFile(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getFileList()); } // 更新应急预案应急队伍表 if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getTeamList())){ updateEmergencyPlanTeam(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getTeamList()); } return new ResultVO<>(ResultCodes.OK); } } private void updateEmergencyPlanArea(Long uid, Long planId, Date nowDate, List<EmergencyPlanAreaReqDTO> areaReqDTOList) { List<EmergencyPlanAreaInfoDO> emergencyPlanAreaInfoDOList = emergencyPlanAreaInfoService.selectEmergencyPlanAreaByPlanId(planId); List<Long> oldIdsList = emergencyPlanAreaInfoDOList.stream().map(EmergencyPlanAreaInfoDO::getId).collect(Collectors.toList()); List<Long> newIdsList = new ArrayList<>(); //新增的区域集合 List<EmergencyPlanAreaInfo> addList = new ArrayList<>(); //删除的区域集合(id) List<Long> deleteList = new ArrayList<>(); for (EmergencyPlanAreaReqDTO emergencyPlanAreaReqDTO : areaReqDTOList){ //如果不存在id则表示页面新增的附件 if (emergencyPlanAreaReqDTO.getId() == null){ EmergencyPlanAreaInfo emergencyPlanAreaInfo = new EmergencyPlanAreaInfo(); BeanUtils.copyProperties(emergencyPlanAreaReqDTO,emergencyPlanAreaInfo); emergencyPlanAreaInfo.setDelFlag(false); emergencyPlanAreaInfo.setGmtCreate(nowDate); emergencyPlanAreaInfo.setCreateUid(uid); emergencyPlanAreaInfo.setPlanId(planId); addList.add(emergencyPlanAreaInfo); } //如果存在id则判断页面是否删除 else{ newIdsList.add(emergencyPlanAreaReqDTO.getId()); } } for (Long oldId : oldIdsList){ if (!newIdsList.contains(oldId)){ deleteList.add(oldId); } } if (!CollectionUtils.isEmpty(addList)){ for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : addList){ emergencyPlanAreaInfoService.addEmergencyPlanArea(emergencyPlanAreaInfo); } } if (!CollectionUtils.isEmpty(deleteList)){ emergencyPlanAreaInfoService.deleteEmergencyPlanAreaByIds(deleteList); } } private void updateEmergencyPlanDepartment(Long uid, Long planId, Date nowDate, List<EmergencyPlanDepartmentReqDTO> departmentReqDTOList) { List<EmergencyPlanDepartmentInfoDO> emergencyPlanDepartmentInfoDOList = emergencyPlanDepartmentInfoService.selectEmergencyPlanDepartmentByPlanId(planId); List<Long> oldIdsList = emergencyPlanDepartmentInfoDOList.stream().map(EmergencyPlanDepartmentInfoDO::getId).collect(Collectors.toList()); List<Long> newIdsList = new ArrayList<>(); //新增的区域集合 List<EmergencyPlanDepartmentInfo> addList = new ArrayList<>(); //删除的区域集合(id) List<Long> deleteList = new ArrayList<>(); for (EmergencyPlanDepartmentReqDTO emergencyPlanDepartmentReqDTO : departmentReqDTOList){ //如果不存在id则表示页面新增的附件 if (emergencyPlanDepartmentReqDTO.getId() == null){ EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo = new EmergencyPlanDepartmentInfo(); BeanUtils.copyProperties(emergencyPlanDepartmentReqDTO,emergencyPlanDepartmentInfo); emergencyPlanDepartmentInfo.setDelFlag(false); emergencyPlanDepartmentInfo.setGmtCreate(nowDate); emergencyPlanDepartmentInfo.setCreateUid(uid); emergencyPlanDepartmentInfo.setPlanId(planId); addList.add(emergencyPlanDepartmentInfo); } //如果存在id则判断页面是否删除 else{ newIdsList.add(emergencyPlanDepartmentReqDTO.getId()); } } for (Long oldId : oldIdsList){ if (!newIdsList.contains(oldId)){ deleteList.add(oldId); } } if (!CollectionUtils.isEmpty(addList)){ for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : addList){ emergencyPlanDepartmentInfoService.addEmergencyPlanDepartment(emergencyPlanDepartmentInfo); } } if (!CollectionUtils.isEmpty(deleteList)){ emergencyPlanDepartmentInfoService.deleteEmergencyPlanDepartmentByIds(deleteList); } } private void updateEmergencyPlanFile(Long uid, Long planId, Date nowDate, List<EmergencyPlanFileReqDTO> fileReqDTOList) { List<EmergencyPlanFileInfoDO> emergencyPlanFileInfoDOList = emergencyPlanFileInfoService.selectEmergencyPlanFileByPlanId(planId); List<Long> oldIdsList = emergencyPlanFileInfoDOList.stream().map(EmergencyPlanFileInfoDO::getId).collect(Collectors.toList()); List<Long> newIdsList = new ArrayList<>(); //新增的区域集合 List<EmergencyPlanFileInfo> addList = new ArrayList<>(); //删除的区域集合(id) List<Long> deleteList = new ArrayList<>(); for (EmergencyPlanFileReqDTO emergencyPlanFileReqDTO : fileReqDTOList){ //如果不存在id则表示页面新增的附件 if (emergencyPlanFileReqDTO.getId() == null){ EmergencyPlanFileInfo emergencyPlanFileInfo = new EmergencyPlanFileInfo(); BeanUtils.copyProperties(emergencyPlanFileReqDTO,emergencyPlanFileInfo); emergencyPlanFileInfo.setDelFlag(false); emergencyPlanFileInfo.setGmtCreate(nowDate); emergencyPlanFileInfo.setCreateUid(uid); emergencyPlanFileInfo.setPlanId(planId); addList.add(emergencyPlanFileInfo); } //如果存在id则判断页面是否删除 else{ newIdsList.add(emergencyPlanFileReqDTO.getId()); } } for (Long oldId : oldIdsList){ if (!newIdsList.contains(oldId)){ deleteList.add(oldId); } } if (!CollectionUtils.isEmpty(addList)){ for (EmergencyPlanFileInfo emergencyPlanFileInfo : addList){ emergencyPlanFileInfoService.addEmergencyPlanFile(emergencyPlanFileInfo); } } if (!CollectionUtils.isEmpty(deleteList)){ emergencyPlanFileInfoService.deleteEmergencyPlanFileByIds(deleteList); } } private void updateEmergencyPlanTeam(Long uid, Long planId, Date nowDate, List<EmergencyPlanTeamReqDTO> teamReqDTOList) { List<EmergencyPlanTeamInfoDO> emergencyPlanTeamInfoDOList = emergencyPlanTeamInfoService.selectEmergencyPlanTeamByPlanId(planId); List<Long> oldIdsList = emergencyPlanTeamInfoDOList.stream().map(EmergencyPlanTeamInfoDO::getId).collect(Collectors.toList()); List<Long> newIdsList = new ArrayList<>(); //新增的区域集合 List<EmergencyPlanTeamInfo> addList = new ArrayList<>(); //删除的区域集合(id) List<Long> deleteList = new ArrayList<>(); for (EmergencyPlanTeamReqDTO emergencyPlanTeamReqDTO : teamReqDTOList){ //如果不存在id则表示页面新增的附件 if (emergencyPlanTeamReqDTO.getId() == null){ EmergencyPlanTeamInfo emergencyPlanTeamInfo = new EmergencyPlanTeamInfo(); BeanUtils.copyProperties(emergencyPlanTeamReqDTO,emergencyPlanTeamInfo); emergencyPlanTeamInfo.setDelFlag(false); emergencyPlanTeamInfo.setGmtCreate(nowDate); emergencyPlanTeamInfo.setCreateUid(uid); emergencyPlanTeamInfo.setPlanId(planId); addList.add(emergencyPlanTeamInfo); } //如果存在id则判断页面是否删除 else{ newIdsList.add(emergencyPlanTeamReqDTO.getId()); } } for (Long oldId : oldIdsList){ if (!newIdsList.contains(oldId)){ deleteList.add(oldId); } } if (!CollectionUtils.isEmpty(addList)){ for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : addList){ emergencyPlanTeamInfoService.addEmergencyPlanTeam(emergencyPlanTeamInfo); } } if (!CollectionUtils.isEmpty(deleteList)){ emergencyPlanTeamInfoService.deleteEmergencyPlanTeamByIds(deleteList); } } @Override public ResultVO batchDeleteEmergencyPlan(String ids) { if (StringUtils.isBlank(ids)) { throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST); } else { String[] idArr = ids.split(","); for (String id : idArr) { deleteEmergencyPlan(Long.valueOf(id)); } return new ResultVO(ResultCodes.OK); } } private void deleteEmergencyPlan(Long id) { //查询是否存在 EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(id); if (emergencyPlanInfoDetailDO==null){ throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST); }else{ Long PlanId = emergencyPlanInfoDetailDO.getId(); //删除区域 emergencyPlanAreaInfoService.deleteEmergencyPlanAreaByPlanId(PlanId); //删除适用部门 emergencyPlanDepartmentInfoService.deleteEmergencyPlanDepartmentByPlanId(PlanId); //删除附件 emergencyPlanFileInfoService.deleteEmergencyPlanFileByPlanId(PlanId); //删除应急队伍 emergencyPlanTeamInfoService.deleteEmergencyPlanTeamByPlanId(PlanId); } } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -159,6 +159,7 @@ @Override public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) { Date nowDate = new Date(); //查询是否存在 EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(emergencyTeamReqDTO.getId()); if (emergencyTeamInfoDetailDO==null){ @@ -167,16 +168,15 @@ EmergencyTeamInfo emergencyTeamInfo = new EmergencyTeamInfo(); BeanUtils.copyProperties(emergencyTeamReqDTO,emergencyTeamInfo); emergencyTeamInfo.setUpdateUid(uid); emergencyTeamInfo.setGmtModitify(new Date()); emergencyTeamInfo.setGmtModitify(nowDate); emergencyTeamInfoService.updateEmergencyTeam(emergencyTeamInfo); //修改应急队伍附件 updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),emergencyTeamReqDTO.getFileList()); updateEmergencyTeamFile(uid,emergencyTeamReqDTO.getId(),nowDate,emergencyTeamReqDTO.getFileList()); return new ResultVO(ResultCodes.OK); } } private void updateEmergencyTeamFile(Long uid ,Long teamId ,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){ Date nowDate = new Date(); private void updateEmergencyTeamFile(Long uid ,Long teamId ,Date nowDate,List<EmergencyTeamFileReqDTO> emergencyTeamFileReqDTOList){ List<EmergencyTeamFileInfoDO> emergencyTeamFileInfoDOList = emergencyTeamFileInfoService.selectByEmergencyTeamId(teamId); List<Long> oldIdsList = emergencyTeamFileInfoDOList.stream().map(EmergencyTeamFileInfoDO::getId).collect(Collectors.toList()); @@ -245,7 +245,19 @@ } @Override public ResultVO deleteEmergencyTeam(Long id) { public ResultVO batchDeleteEmergencyTeam(String ids) { if (StringUtils.isBlank(ids)){ throw new EmergencyException(EmergencyResultCodes.TEAM_NULL); }else{ String[] idArr = ids.split(","); for (String id : idArr) { deleteEmergencyTeam(Long.valueOf(id)); } return new ResultVO(ResultCodes.OK); } } private void deleteEmergencyTeam(Long id) { //查询是否存在 EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(id); if (emergencyTeamInfoDetailDO==null){ @@ -258,20 +270,6 @@ emergencyTeamFileInfoService.deleteEmergencyTeamFileByTeamId(teamId); //删除应急队伍 emergencyTeamInfoService.deleteEmergencyTeamById(teamId); return new ResultVO(ResultCodes.OK); } } @Override public ResultVO batchDeleteEmergencyTeam(String ids) { if (StringUtils.isBlank(ids)){ throw new EmergencyException(EmergencyResultCodes.TEAM_NULL); }else{ String[] idArr = ids.split(","); for (String id : idArr) { deleteEmergencyTeam(Long.valueOf(id)); } return new ResultVO(ResultCodes.OK); } } emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
@@ -38,4 +38,16 @@ <select id="selectEmergencyPlanAreaByPlanId" resultMap="emergencyPlanAreaInfoDOResult"> select id , plan_id , area_id from emergency_plan_area where plan_id=#{planId} </select> <update id = "deleteEmergencyPlanAreaByIds" > update emergency_plan_area set del_flag = 1 where id in <foreach item="id" collection="ids" open="(" separator="," close=")"> #{id} </foreach> </update> <update id="deleteEmergencyPlanAreaByPlanId"> update emergency_plan_area set del_flag = 1 where plan_id = #{planId} </update> </mapper> emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
@@ -39,4 +39,15 @@ select id , plan_id , department_id from emergency_plan_department where plan_id=#{planId} </select> <update id = "deleteEmergencyPlanDepartmentByIds" > update emergency_plan_department set del_flag = 1 where id in <foreach item="id" collection="ids" open="(" separator="," close=")"> #{id} </foreach> </update> <update id="deleteEmergencyPlanDepartmentByPlanId"> update emergency_plan_department set del_flag = 1 where plan_id = #{planId} </update> </mapper> emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml
@@ -40,4 +40,16 @@ <select id="selectEmergencyPlanFileByPlanId" resultMap="emergencyPlanFileInfoDOResult"> select id,`plan_id`,`file_url`,`file_name` from emergency_plan_file where del_flag = 0 and plan_id = #{planId} </select> <update id = "deleteEmergencyPlanFileByIds" > update emergency_plan_file set del_flag = 1 where id in <foreach item="id" collection="ids" open="(" separator="," close=")"> #{id} </foreach> </update> <update id="deleteEmergencyPlanFileByPlanId"> update emergency_plan_file set del_flag = 1 where plan_id = #{planId} </update> </mapper> emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
@@ -73,4 +73,23 @@ select id ,`name`,`status`,`type`,`level`,release_date ,author_uid ,author_dept_id ,associated_danger from emergency_plan where del_flag = 0 and id = #{id} </select> <update id="updateEmergencyPlan" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo"> update emergency_team <trim prefix="SET" suffixOverrides=","> <if test="gmtCreate != null ">gmt_create = #{gmtCreate},</if> <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if> <if test="createUid != null ">create_uid = #{createUid},</if> <if test="updateUid != null ">update_uid = #{updateUid},</if> <if test="status != null ">status = #{status},</if> <if test="releaseDate != null ">release_date = #{releaseDate},</if> <if test="authorUid != null ">author_uid = #{authorUid},</if> <if test="authorDeptId != null ">author_dept_id = #{authorDeptId},</if> <if test="associatedDanger != null ">associated_danger = #{associatedDanger},</if> <if test="type != null and type != ''">type = #{type},</if> <if test="level != null and level != ''">level = #{level},</if> <if test="name != null and name != ''">name = #{name},</if> </trim> where id = #{id} </update> </mapper> emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
@@ -38,4 +38,15 @@ select id ,plan_id ,team_id from emergency_plan_team where plan_id=#{planId} </select> <update id = "deleteEmergencyPlanTeamByIds" > update emergency_plan_team set del_flag = 1 where id in <foreach item="id" collection="ids" open="(" separator="," close=")"> #{id} </foreach> </update> <update id="deleteEmergencyPlanTeamByPlanId"> update emergency_plan_team set del_flag = 1 where plan_id = #{planId} </update> </mapper>