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/model/dto/resp/EmergencyPlanLogRespDTO.java | 12 ++--
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml | 2
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml | 12 ++--
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfo.java | 12 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java | 84 +++++++++++++++++++---------
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java | 4 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml | 2
8 files changed, 81 insertions(+), 49 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfo.java
index 64a94a4..10f97de 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfo.java
@@ -24,7 +24,7 @@
private Long planId;
- private Long userUId;
+ private Long userUid;
private Date startCreate;
@@ -86,12 +86,12 @@
this.planId = planId;
}
- public Long getUserUId() {
- return userUId;
+ public Long getUserUid() {
+ return userUid;
}
- public void setUserUId(Long userUId) {
- this.userUId = userUId;
+ public void setUserUid(Long userUid) {
+ this.userUid = userUid;
}
public Date getStartCreate() {
@@ -120,7 +120,7 @@
", createUid=" + createUid +
", updateUid=" + updateUid +
", planId=" + planId +
- ", userUId=" + userUId +
+ ", userUid=" + userUid +
", startCreate=" + startCreate +
", remark='" + remark + '\'' +
'}';
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
index 735aacd..a0a7ff8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -32,7 +32,9 @@
PLAN_NOT_EXIST("P1001" , "应急预案不存在"),
- PLAN_LOG_NOT_EXIST("P1002" , "应急预案启动记录不存在"),
+ PLAN_NULL("P1002" , "应急预案不可为空"),
+
+ PLAN_LOG_NOT_EXIST("P1003" , "应急预案启动记录不存在"),
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
index 66f33a6..7d88e82 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
@@ -10,7 +10,7 @@
private Long planId;
- private Long userUId;
+ private Long userUid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startCreate;
@@ -33,12 +33,12 @@
this.planId = planId;
}
- public Long getUserUId() {
- return userUId;
+ public Long getUserUid() {
+ return userUid;
}
- public void setUserUId(Long userUId) {
- this.userUId = userUId;
+ public void setUserUid(Long userUid) {
+ this.userUid = userUid;
}
public Date getStartCreate() {
@@ -62,7 +62,7 @@
return "EmergencyPlanLogRespDTO{" +
"id=" + id +
", planId=" + planId +
- ", userUId=" + userUId +
+ ", userUid=" + userUid +
", startCreate=" + startCreate +
", remark='" + remark + '\'' +
'}';
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);
}
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
index 248bc4b..b1cc9fa 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
@@ -36,7 +36,7 @@
</resultMap>
<select id="selectEmergencyPlanAreaByPlanId" resultMap="emergencyPlanAreaInfoDOResult">
- select id , plan_id , area_id from emergency_plan_area where plan_id=#{planId}
+ select id , plan_id , area_id from emergency_plan_area where plan_id=#{planId} and del_flag = 0
</select>
<update id = "deleteEmergencyPlanAreaByIds" >
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
index 00e8795..ec7b714 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
@@ -36,7 +36,7 @@
</resultMap>
<select id="selectEmergencyPlanDepartmentByPlanId" resultMap="emergencyPlanDepartmentInfoDOResult">
- select id , plan_id , department_id from emergency_plan_department where plan_id=#{planId}
+ select id , plan_id , department_id from emergency_plan_department where plan_id=#{planId} and del_flag = 0
</select>
<update id = "deleteEmergencyPlanDepartmentByIds" >
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
index 5b4b6fe..2768d11 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
@@ -27,9 +27,9 @@
<if test="gmtModitify != null ">gmt_moditify,</if>
<if test="createUid != null ">create_uid,</if>
<if test="updateUid != null ">update_uid,</if>
- <if test="plan_id != null ">plan_id,</if>
- <if test="user_uid != null ">user_uid,</if>
- <if test="start_create != null ">start_create,</if>
+ <if test="planId != null ">plan_id,</if>
+ <if test="userUid != null ">user_uid,</if>
+ <if test="startCreate != null ">start_create,</if>
<if test="remark != null and remark != ''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -39,9 +39,9 @@
<if test="gmtModitify != null ">#{gmtModitify},</if>
<if test="createUid != null ">#{createUid},</if>
<if test="updateUid != null ">#{updateUid},</if>
- <if test="plan_id != null ">#{planId},</if>
- <if test="user_uid != null ">#{userUid},</if>
- <if test="start_create != null ">#{startCreate},</if>
+ <if test="planId != null ">#{planId},</if>
+ <if test="userUid != null ">#{userUid},</if>
+ <if test="startCreate != null ">#{startCreate},</if>
<if test="remark != null and remark != ''">#{remark},</if>
</trim>
</insert>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
index 42678b1..f12ee88 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
@@ -35,7 +35,7 @@
</resultMap>
<select id="selectEmergencyPlanTeamByPlanId" resultMap="emergencyPlanTeamInfoDOResult">
- select id ,plan_id ,team_id from emergency_plan_team where plan_id=#{planId}
+ select id ,plan_id ,team_id from emergency_plan_team where plan_id=#{planId} and del_flag = 0
</select>
<update id = "deleteEmergencyPlanTeamByIds" >
--
Gitblit v1.9.2