From f8f809db535e735eb47432ed3c4b8c5e7aa879a3 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 11 七月 2022 10:11:23 +0800 Subject: [PATCH] 应急队伍启动记录 --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java | 84 ++++++++++++++++++++++++++++------------- 1 files changed, 57 insertions(+), 27 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java index 1fc90c8..8e7ef52 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java @@ -32,6 +32,9 @@ @Autowired private EmergencyPlanLogInfoService emergencyPlanLogInfoService; + @Autowired + private EmergencyPlanInfoService emergencyPlanInfoService; + @Override public SearchResultVO<List<EmergencyPlanLogRespDTO>> selectEmergencyPlanLogList(PageQuery<EmergencyPlanLogQuery> query) { Long pageIndex = query.getPageIndex(); @@ -42,8 +45,8 @@ if (query.getSearchParams() != null) { BeanUtils.copyProperties(query.getSearchParams(), emergencyPlanLogDBQuery); } - List<EmergencyPlanLogInfoDO> emergencyPlanLogListDoInfoList = emergencyPlanLogInfoService.selectEmergencyPlanLogList(page,emergencyPlanLogDBQuery); - List<EmergencyPlanLogRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyPlanLogListDoInfoList, EmergencyPlanLogRespDTO.class); + List<EmergencyPlanLogInfoDO> emergencyPlanLogListDoInfoList = emergencyPlanLogInfoService.selectEmergencyPlanLogList(page, emergencyPlanLogDBQuery); + List<EmergencyPlanLogRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyPlanLogListDoInfoList, EmergencyPlanLogRespDTO.class); return new SearchResultVO<>( true, @@ -52,21 +55,37 @@ page.getTotal(), respList, ResultCodes.OK - ); + ); } @Override public ResultVO addEmergencyPlanLog(Long uid, EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) { - Date nowDate = new Date(); - // 新增应急预案 - EmergencyPlanLogInfo emergencyPlanLogInfo = new EmergencyPlanLogInfo(); - BeanUtils.copyProperties(emergencyPlanLogReqDTO,emergencyPlanLogInfo); - emergencyPlanLogInfo.setDelFlag(false); - emergencyPlanLogInfo.setCreateUid(uid); - emergencyPlanLogInfo.setGmtCreate(nowDate); - emergencyPlanLogInfoService.addEmergencyPlanLog(emergencyPlanLogInfo); + // 判断请求中是否存在应急预案id + if (emergencyPlanLogReqDTO.getPlanId() == null) { + throw new EmergencyException(EmergencyResultCodes.PLAN_NULL); + } else { + EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(emergencyPlanLogReqDTO.getPlanId()); + // 判断是否存在该应急预案 + if (emergencyPlanInfoDetailDO == null) { + throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST); + } else { + Date nowDate = new Date(); + // 新增应急预案启动记录 + EmergencyPlanLogInfo emergencyPlanLogInfo = new EmergencyPlanLogInfo(); + BeanUtils.copyProperties(emergencyPlanLogReqDTO, emergencyPlanLogInfo); + emergencyPlanLogInfo.setDelFlag(false); + emergencyPlanLogInfo.setCreateUid(uid); + emergencyPlanLogInfo.setGmtCreate(nowDate); - return new ResultVO<>(ResultCodes.OK); + emergencyPlanLogInfo.setUserUid(uid); + emergencyPlanLogInfo.setStartCreate(nowDate); + emergencyPlanLogInfoService.addEmergencyPlanLog(emergencyPlanLogInfo); + + return new ResultVO<>(ResultCodes.OK); + } + } + + } @@ -75,29 +94,40 @@ EmergencyPlanLogRespDTO emergencyPlanLogDetailRespDTO = new EmergencyPlanLogRespDTO(); // 查询是否存在 EmergencyPlanLogInfoDO emergencyPlanLogInfoDetailDO = emergencyPlanLogInfoService.selectEmergencyPlanLogById(id); - if (emergencyPlanLogInfoDetailDO==null){ + if (emergencyPlanLogInfoDetailDO == null) { throw new EmergencyException(EmergencyResultCodes.PLAN_LOG_NOT_EXIST); - }else{ - BeanUtils.copyProperties(emergencyPlanLogInfoDetailDO,emergencyPlanLogDetailRespDTO); + } else { + BeanUtils.copyProperties(emergencyPlanLogInfoDetailDO, emergencyPlanLogDetailRespDTO); - return new ResultVO<>(ResultCodes.OK,emergencyPlanLogDetailRespDTO); + return new ResultVO<>(ResultCodes.OK, emergencyPlanLogDetailRespDTO); } } @Override public ResultVO updateEmergencyPlanLog(Long uid, EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) { - // 查询是否存在 + // 查询是否存在启动记录 EmergencyPlanLogInfoDO emergencyPlanLogInfoDetailDO = emergencyPlanLogInfoService.selectEmergencyPlanLogById(emergencyPlanLogReqDTO.getId()); - if (emergencyPlanLogInfoDetailDO==null){ + if (emergencyPlanLogInfoDetailDO == null) { throw new EmergencyException(EmergencyResultCodes.PLAN_LOG_NOT_EXIST); - }else{ - EmergencyPlanLogInfo emergencyPlanLogInfo = new EmergencyPlanLogInfo(); - BeanUtils.copyProperties(emergencyPlanLogReqDTO,emergencyPlanLogInfo); - emergencyPlanLogInfo.setUpdateUid(uid); - emergencyPlanLogInfo.setGmtModitify(new Date()); - emergencyPlanLogInfoService.updateEmergencyPlanLog(emergencyPlanLogInfo); + } else { + // 判断请求中是否存在应急预案id + if (emergencyPlanLogReqDTO.getPlanId() == null) { + throw new EmergencyException(EmergencyResultCodes.PLAN_NULL); + } else { + EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(emergencyPlanLogReqDTO.getPlanId()); + // 判断是否存在该应急预案 + if (emergencyPlanInfoDetailDO == null) { + throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST); + } else { + EmergencyPlanLogInfo emergencyPlanLogInfo = new EmergencyPlanLogInfo(); + BeanUtils.copyProperties(emergencyPlanLogReqDTO, emergencyPlanLogInfo); + emergencyPlanLogInfo.setUpdateUid(uid); + emergencyPlanLogInfo.setGmtModitify(new Date()); + emergencyPlanLogInfoService.updateEmergencyPlanLog(emergencyPlanLogInfo); - return new ResultVO<>(ResultCodes.OK); + return new ResultVO<>(ResultCodes.OK); + } + } } } @@ -117,9 +147,9 @@ private void deleteEmergencyPlanLog(Long id) { //查询是否存在 EmergencyPlanLogInfoDO emergencyPlanLogInfoDetailDO = emergencyPlanLogInfoService.selectEmergencyPlanLogById(id); - if (emergencyPlanLogInfoDetailDO==null){ + if (emergencyPlanLogInfoDetailDO == null) { throw new EmergencyException(EmergencyResultCodes.PLAN_LOG_NOT_EXIST); - }else{ + } else { emergencyPlanLogInfoService.deleteEmergencyPlanLog(id); } } -- Gitblit v1.9.2