From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 69 insertions(+), 35 deletions(-)
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..7967f23 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
@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -32,6 +33,9 @@
@Autowired
private EmergencyPlanLogInfoService emergencyPlanLogInfoService;
+ @Autowired
+ private EmergencyPlanInfoService emergencyPlanInfoService;
+
@Override
public SearchResultVO<List<EmergencyPlanLogRespDTO>> selectEmergencyPlanLogList(PageQuery<EmergencyPlanLogQuery> query) {
Long pageIndex = query.getPageIndex();
@@ -42,31 +46,51 @@
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,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
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);
+ public ResultVO addEmergencyPlanLog(ContextCacheUser currentUser, EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
+ Long uid = currentUser.getUid();
+ String uname = currentUser.getRealName();
+ // 判断请求中是否存在应急预案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.setUserName(uname);
+ emergencyPlanLogInfo.setStartCreate(nowDate);
+
+ emergencyPlanLogInfoService.addEmergencyPlanLog(emergencyPlanLogInfo);
+
+ return new ResultVO<>(ResultCodes.OK);
+ }
+ }
+
+
}
@@ -75,40 +99,50 @@
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);
+ }
+ }
}
}
@Override
- public ResultVO batchDeleteEmergencyPlanLog(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencyPlanLog(Long[] ids) {
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.PLAN_LOG_NOT_EXIST);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyPlanLog(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencyPlanLog(id);
}
return new ResultVO(ResultCodes.OK);
}
@@ -117,9 +151,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);
}
}
--
Gitblit v1.9.2