From 1341b18605bcb800eba683eda18640520a6508a5 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 15 Sep 2022 15:38:05 +0800
Subject: [PATCH] 事故数据字典fix
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
index 69ee086..72b3cc9 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
@@ -10,6 +10,9 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.incidentManage.entity.*;
+import com.gkhy.safePlatform.incidentManage.enums.AccidentReportGradeEnum;
+import com.gkhy.safePlatform.incidentManage.enums.AccidentReportLevelEnum;
+import com.gkhy.safePlatform.incidentManage.enums.AccidentReportTypeEnum;
import com.gkhy.safePlatform.incidentManage.enums.AccidentResultCodes;
import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportFileReqDTO;
@@ -99,6 +102,8 @@
public ResultVO addAccidentReport(Long uid, AccidentReportReqDTO accidentReportReqDTO) {
//必填项验证
checkRequired(accidentReportReqDTO);
+ // 验证枚举
+ checkEnum(accidentReportReqDTO);
Date nowDate = new Date();
//1.新增事故报告
@@ -157,6 +162,9 @@
@Override
public ResultVO updateAccidentReport(Long uid, AccidentReportReqDTO accidentReportReqDTO) {
+ // 验证枚举
+ checkEnum(accidentReportReqDTO);
+
Date nowDate = new Date();
//查询是否存在
AccidentReportInfoDetailDO AccidentReportInfoDetailDO = accidentReportInfoService.selectAccidentReportById(accidentReportReqDTO.getId());
@@ -218,11 +226,11 @@
@Override
public ResultVO batchDeleteAccidentReport(Long[] ids) {
- if (ids == null || ids.length==0){
+ if (ids == null || ids.length == 0) {
throw new AccidentException(AccidentResultCodes.ACCIDENT_REPORT_NULL);
} else {
- for (Long id : ids){
+ for (Long id : ids) {
deleteAccidentReport(id);
}
return new ResultVO(ResultCodes.OK);
@@ -248,64 +256,79 @@
*
* @return
*/
- private void checkRequired(AccidentReportReqDTO AccidentReportReqDTO) {
+ private void checkRequired(AccidentReportReqDTO accidentReportReqDTO) {
//事故快报
- if (AccidentReportReqDTO.getAccidentExpressId() == null) {
+ if (accidentReportReqDTO.getAccidentExpressId() == null) {
throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
}
- AccidentExpressInfoDetailDO accidentExpressInfo = accidentExpressInfoService.selectAccidentExpressById(AccidentReportReqDTO.getAccidentExpressId());
+ AccidentExpressInfoDetailDO accidentExpressInfo = accidentExpressInfoService.selectAccidentExpressById(accidentReportReqDTO.getAccidentExpressId());
if (accidentExpressInfo == null) {
throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NOT_EXIST);
}
//事故类型
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentType())) {
+ if (accidentReportReqDTO.getAccidentType() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_TYPE_NULL);
}
//事故等级
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentGrade())) {
+ if (accidentReportReqDTO.getAccidentGrade() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_GRADE_NULL);
}
//经济损失
- if (AccidentReportReqDTO.getEconomicLoss() == null) {
+ if (accidentReportReqDTO.getEconomicLoss() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_ECONOMIC_LOSS_NULL);
}
//要求报告完成期限
- if (AccidentReportReqDTO.getReportDeadline() == null) {
+ if (accidentReportReqDTO.getReportDeadline() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_REPORT_DEADLINE_NULL);
}
//事故级别
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentLevel())) {
+ if (accidentReportReqDTO.getAccidentLevel() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_LEVEL_NULL);
}
//原因综合分析（直接）
- if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisDirect())) {
+ if (StringUtils.isBlank(accidentReportReqDTO.getComprehensiveAnalysisDirect())) {
throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_DIRECT_NULL);
}
//原因综合分析（直接）
- if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisDirect())) {
+ if (StringUtils.isBlank(accidentReportReqDTO.getComprehensiveAnalysisDirect())) {
throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_DIRECT_NULL);
}
//原因综合分析（间接）
- if (StringUtils.isBlank(AccidentReportReqDTO.getComprehensiveAnalysisIndirect())) {
+ if (StringUtils.isBlank(accidentReportReqDTO.getComprehensiveAnalysisIndirect())) {
throw new AccidentException(AccidentResultCodes.REPORT_COMPREHENSIVE_ANALYSIS_INDIRECT_NULL);
}
//整改措施
- if (StringUtils.isBlank(AccidentReportReqDTO.getRectificationMeasures())) {
+ if (StringUtils.isBlank(accidentReportReqDTO.getRectificationMeasures())) {
throw new AccidentException(AccidentResultCodes.REPORT_RECTIFICATION_MEASURES_NULL);
}
//事故处理
- if (StringUtils.isBlank(AccidentReportReqDTO.getAccidentHandling())) {
+ if (StringUtils.isBlank(accidentReportReqDTO.getAccidentHandling())) {
throw new AccidentException(AccidentResultCodes.REPORT_ACCIDENT_HANDLING_NULL);
}
//填写人
- if (AccidentReportReqDTO.getFillInUserUid() == null) {
+ if (accidentReportReqDTO.getFillInUserUid() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_FILL_IN_USER_UID_NULL);
}
//填写日期
- if (AccidentReportReqDTO.getFillInTime() == null) {
+ if (accidentReportReqDTO.getFillInTime() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_FILL_IN_TIME_NULL);
}
}
+ /**
+ * 枚举验证
+ */
+ private void checkEnum(AccidentReportReqDTO accidentExpressReqDTO) {
+ if (AccidentReportTypeEnum.getByCode(accidentExpressReqDTO.getAccidentType()) == null) {
+ throw new AccidentException(AccidentResultCodes.REPORT_ENUMS_TYPE_NOT_EXIST);
+ }
+ if (AccidentReportGradeEnum.getByCode(accidentExpressReqDTO.getAccidentGrade()) == null) {
+ throw new AccidentException(AccidentResultCodes.REPORT_ENUMS_GRADE_NOT_EXIST);
+ }
+ if (AccidentReportLevelEnum.getByCode(accidentExpressReqDTO.getAccidentLevel()) == null) {
+ throw new AccidentException(AccidentResultCodes.REPORT_ENUMS_LEVEL_NOT_EXIST);
+ }
+ }
+
}
--
Gitblit v1.9.2