From ecc3b4099e595bc52037dd3ef39dcac26f58749d Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 11:40:47 +0800
Subject: [PATCH] 应急启动记录接口fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 479b644..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;
@@ -59,7 +60,9 @@
}
@Override
- public ResultVO addEmergencyPlanLog(Long uid, EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
+ 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);
@@ -78,7 +81,9 @@
emergencyPlanLogInfo.setGmtCreate(nowDate);
emergencyPlanLogInfo.setUserUid(uid);
+ emergencyPlanLogInfo.setUserName(uname);
emergencyPlanLogInfo.setStartCreate(nowDate);
+
emergencyPlanLogInfoService.addEmergencyPlanLog(emergencyPlanLogInfo);
return new ResultVO<>(ResultCodes.OK);
@@ -132,13 +137,12 @@
}
@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);
}
--
Gitblit v1.9.2