From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
index 14b3936..513b392 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.emergency.service.impl;
+import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
@@ -7,6 +8,8 @@
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.DrillPlanLevelEnum;
+import com.gkhy.safePlatform.emergency.enums.DrillPlanWayEnum;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -66,6 +69,11 @@
@Override
public ResultVO addEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
+ // 验证必填
+ checkRequired(emergencyDrillPlanReqDTO);
+ // 验证枚举
+ checkEnum(emergencyDrillPlanReqDTO);
+
// 判断请求中是否存在应急预案id
if (emergencyDrillPlanReqDTO.getPlanId() == null) {
throw new EmergencyException(EmergencyResultCodes.PLAN_NULL);
@@ -156,6 +164,12 @@
@Override
public ResultVO updateEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
+
+ // 验证必填
+ checkRequired(emergencyDrillPlanReqDTO);
+ // 验证枚举
+ checkEnum(emergencyDrillPlanReqDTO);
+
Date nowDate = new Date();
// 查询是否存在
EmergencyDrillPlanInfoDetailDO emergencyDrillPlanInfoDetailDO = emergencyDrillPlanInfoService.selectEmergencyDrillPlanById(emergencyDrillPlanReqDTO.getId());
@@ -290,4 +304,28 @@
emergencyDrillPlanUserInfoService.deleteEmergencyDrillPlanUserByDrillPlanId(DrillPlanId);
}
}
+
+
+ /**
+ * 验证必填项
+ * @return
+ */
+ private void checkRequired(EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
+ //名称
+ if (StringUtils.isBlank(emergencyDrillPlanReqDTO.getDrillName())) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NAME_NULL);
+ }
+ }
+
+ /**
+ * 验证枚举
+ */
+ private void checkEnum(EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO){
+ if (DrillPlanWayEnum.getByCode(emergencyDrillPlanReqDTO.getDrillWay())==null){
+ throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_ENUM_WAY_NOT_EXIST);
+ }
+ if (DrillPlanLevelEnum.getByCode(emergencyDrillPlanReqDTO.getDrillLevel())==null){
+ throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_ENUM_LEVEL_NOT_EXIST);
+ }
+ }
}
--
Gitblit v1.9.2