From 2a6c0b5cefd70e2828e87d6ade3d5f36f723ad7f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 26 七月 2022 16:48:06 +0800
Subject: [PATCH] 应急队伍一览接口
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java | 78 +++++++++++++++++----------------------
1 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
index 418db46..6ae47a0 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
@@ -51,9 +51,12 @@
BeanUtils.copyProperties(query.getSearchParams(), accidentExpressDBQuery);
}
-
List<AccidentExpressInfoPageDO> accidentExpressInfoPageDOList = accidentExpressInfoService.selectAccidentExpressList(page, accidentExpressDBQuery);
List<AccidentExpressPageRespDTO> respList = BeanCopyUtils.copyBeanList(accidentExpressInfoPageDOList, AccidentExpressPageRespDTO.class);
+
+ respList.forEach(AccidentExpressPageRespDTO ->{
+
+ });
return new SearchResultVO<>(
true,
@@ -211,55 +214,42 @@
* @return
*/
private void checkRequired(AccidentExpressReqDTO AccidentExpressReqDTO) {
- /* //名称
- if (StringUtils.isBlank(AccidentExpressReqDTO.getTeamName())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_NAME_NULL);
+ //名称
+ if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentName())) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_NAME_NULL);
}
- //级别
- if (StringUtils.isBlank(AccidentExpressReqDTO.getTeamLevel())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_LEVEL_NULL);
+ //部门
+ if (AccidentExpressReqDTO.getAccidentDepartmentId()==null) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_DEPARTMENT_NULL);
}
- //负责人
- if (AccidentExpressReqDTO.getPrincipalUid() == null || AccidentExpressReqDTO.getPrincipalUid() == 0) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_NULL);
+ //发生时间
+ if (AccidentExpressReqDTO.getOccurrenceTime() == null ) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_TIME_NULL);
}
- //负责人部门
- if (AccidentExpressReqDTO.getPrincipalDepartmentId() == null || AccidentExpressReqDTO.getPrincipalDepartmentId() == 0) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_DEPARTMENT_NULL);
+ //发生地点
+ if (StringUtils.isBlank(AccidentExpressReqDTO.getOccurrencePlace())) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_PLACE_NULL);
}
- //负责人手机
- if (StringUtils.isBlank(AccidentExpressReqDTO.getPrincipalPhone())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_PRINCIPAL_PHONE_NULL);
+ //事故原因
+ if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentCause())) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_CAUSE_NULL);
}
- //固定电话
- if (StringUtils.isBlank(AccidentExpressReqDTO.getTelephoneNumber())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_TELEPHONE_NUMBER_NULL);
+ //是否有伤亡
+ if (AccidentExpressReqDTO.getCasualties()==null) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_CASUALTIES_NULL);
}
- //人员列表如果不为空，则需要验证其中的必填项
- if (!CollectionUtils.isEmpty(AccidentExpressReqDTO.getMemberList())){
- for(AccidentExpressMemberReqDTO AccidentExpressMemberReqDTO : AccidentExpressReqDTO.getMemberList()){
- //工号
- if (StringUtils.isBlank(AccidentExpressMemberReqDTO.getJobNumber())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_USER_JOB_NUMBER_NULL);
- }
- //名称
- if (StringUtils.isBlank(AccidentExpressMemberReqDTO.getName())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_USER_NAME_NULL);
- }
- //性别
- if (AccidentExpressMemberReqDTO.getGender()==null) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_USER_GENDER_NULL);
- }
- //手机号码
- if (StringUtils.isBlank(AccidentExpressMemberReqDTO.getPhone())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_USER_PHONE_NULL);
- }
- //职务
- if (StringUtils.isBlank(AccidentExpressMemberReqDTO.getPosition())) {
- throw new EmergencyException(EmergencyResultCodes.TEAM_USER_POSITION_NULL);
- }
- }
- }*/
+ //简要经过
+ if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentBriefProcess())) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_BRIEF_PROCESS_NULL);
+ }
+ //初步分析
+ if (StringUtils.isBlank(AccidentExpressReqDTO.getAccidentCausesPreliminaryAnalysis())) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_CASE_PRELIMINARY_ANALYSIS_NULL);
+ }
+ //应急防范措施
+ if (StringUtils.isBlank(AccidentExpressReqDTO.getEmergencyPrecautions())) {
+ throw new AccidentException(AccidentResultCodes.EXPRESS_EMERGENCY_PRECAUTIONS_NULL);
+ }
}
}
--
Gitblit v1.9.2