From 0414ddb0b2b3a7199ae6181a770f97ac140dbd73 Mon Sep 17 00:00:00 2001 From: zhangf <1603559716@qq.com> Date: 星期三, 08 五月 2024 16:46:22 +0800 Subject: [PATCH] spi统计 --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java | 61 ++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 5 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java index 3a52bb9..e10a260 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java @@ -8,7 +8,7 @@ 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.EmergencyResultCodes; +import com.gkhy.safePlatform.emergency.enums.*; import com.gkhy.safePlatform.emergency.excepiton.EmergencyException; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationFileReqDTO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationReqDTO; @@ -77,12 +77,15 @@ @Override public ResultVO addEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) { + // 验证枚举 + checkEnum(emergencyDrillEvaluationReqDTO); + // 判断请求中是否存在演练计划id if (emergencyDrillEvaluationReqDTO.getDrillExecuteId() == null) { throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL); } else { EmergencyDrillExecuteInfoDetailDO emergencyDrillExecuteInfoDetailDO = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteById(emergencyDrillEvaluationReqDTO.getDrillExecuteId()); - // 判断是否存在该演练计划 + // 判断是否存在该演练实施 if (emergencyDrillExecuteInfoDetailDO == null) { throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NOT_EXIST); } else { @@ -98,7 +101,7 @@ if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getFileList())) { addEmergencyDrillEvaluationFile(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getFileList()); } - // 新增急演练计划应急人员表 + // 新增急演练实施评价应急人员表 if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) { addEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList()); } @@ -186,6 +189,8 @@ @Override public ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) { + // 验证枚举 + checkEnum(emergencyDrillEvaluationReqDTO); Date nowDate = new Date(); // 查询是否存在 EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(emergencyDrillEvaluationReqDTO.getDrillExecuteId()); @@ -194,15 +199,16 @@ } else { EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo = new EmergencyDrillEvaluationInfo(); BeanUtils.copyProperties(emergencyDrillEvaluationReqDTO, emergencyDrillEvaluationInfo); + emergencyDrillEvaluationInfo.setId(emergencyDrillEvaluationInfoDetailDO.getId()); emergencyDrillEvaluationInfo.setUpdateUid(uid); emergencyDrillEvaluationInfo.setGmtModitify(nowDate); emergencyDrillEvaluationInfoService.updateEmergencyDrillEvaluation(emergencyDrillEvaluationInfo); - // 更新急演练计划附件表 + // 更新急演练实施评价附件表 if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getFileList())) { updateEmergencyDrillEvaluationFile(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getFileList()); } - // 更新急演练计划应急队伍表 + // 更新急演练实施评价应急队伍表 if (!CollectionUtils.isEmpty(emergencyDrillEvaluationReqDTO.getUserList())) { updateEmergencyDrillEvaluationUser(uid, emergencyDrillEvaluationInfo.getId(), nowDate, emergencyDrillEvaluationReqDTO.getUserList()); } @@ -321,4 +327,49 @@ emergencyDrillEvaluationUserInfoService.deleteEmergencyDrillEvaluationUserByDrillEvaluationId(DrillEvaluationId); } } + + + /** + * + * 枚举类验证 + * @param emergencyDrillEvaluationReqDTO + */ + public void checkEnum(EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) { + if (DrillEvaluationSuitableEnum.getByCode(emergencyDrillEvaluationReqDTO.getSuitable()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUITABLE_NOT_EXIST); + } + if (DrillEvaluationSufficientEnum.getByCode(emergencyDrillEvaluationReqDTO.getSufficient()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUFFICIENT_NOT_EXIST); + } + if (DrillEvaluationArrivalEnum.getByCode(emergencyDrillEvaluationReqDTO.getArrival()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_ARRIVAL_NOT_EXIST); + } + if (DrillEvaluationSuppliesEnum.getByCode(emergencyDrillEvaluationReqDTO.getSupplies()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUPPLIES_NOT_EXIST); + } + if (DrillEvaluationProtectionEnum.getByCode(emergencyDrillEvaluationReqDTO.getProtection()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_PROTECTION_NOT_EXIST); + } + if (DrillEvaluationWholeEnum.getByCode(emergencyDrillEvaluationReqDTO.getWhole()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_WHOLE_NOT_EXIST); + } + if (DrillEvaluationDivisionEnum.getByCode(emergencyDrillEvaluationReqDTO.getDivision()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_DIVISION_NOT_EXIST); + } + if (DrillEvaluationEffectEnum.getByCode(emergencyDrillEvaluationReqDTO.getEffect()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_EFFECT_NOT_EXIST); + } + if (DrillEvaluationReportEnum.getByCode(emergencyDrillEvaluationReqDTO.getReport()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_REPORT_NOT_EXIST); + } + if (DrillEvaluationSafetyEnum.getByCode(emergencyDrillEvaluationReqDTO.getSafety()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SAFETY_NOT_EXIST); + } + if (DrillEvaluationRescueEnum.getByCode(emergencyDrillEvaluationReqDTO.getRescue()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_RESCUE_NOT_EXIST); + } + if (DrillEvaluationEvacuateEnum.getByCode(emergencyDrillEvaluationReqDTO.getEvacuate()) == null) { + throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_EVACUATE_NOT_EXIST); + } + } } -- Gitblit v1.9.2