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/entity/EmergencyPlanLogInfoDO.java | 20 ++++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java | 20 ++++++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanLogService.java | 5 +-
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml | 37 +++++++++++++++++-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java | 6 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfo.java | 10 +++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanLogServiceImpl.java | 18 +++++---
7 files changed, 101 insertions(+), 15 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
index 4bdbf04..2f7b6ae 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
@@ -37,7 +37,7 @@
@RequestMapping(value = "/add",method = RequestMethod.POST)
public ResultVO addEmergencyPlanLog(Authentication authentication, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return emergencyPlanLogService.addEmergencyPlanLog(currentUser.getUid(), emergencyPlanLogReqDTO);
+ return emergencyPlanLogService.addEmergencyPlanLog(currentUser, emergencyPlanLogReqDTO);
}
/**
@@ -60,8 +60,8 @@
/**
* 应急预案删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencyPlanLog(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencyPlanLog(@RequestBody Long[] ids){
return emergencyPlanLogService.batchDeleteEmergencyPlanLog(ids);
}
}
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 10f97de..27af7d4 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
@@ -9,6 +9,16 @@
@TableName("emergency_plan_log")
public class EmergencyPlanLogInfo {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfoDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfoDO.java
index a759308..28e2a6d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfoDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanLogInfoDO.java
@@ -9,6 +9,26 @@
@TableName("emergency_plan_log")
public class EmergencyPlanLogInfoDO {
+ private String planName;
+
+ public String getPlanName() {
+ return planName;
+ }
+
+ public void setPlanName(String planName) {
+ this.planName = planName;
+ }
+
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
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 7d88e82..8f8793b 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
@@ -6,6 +6,26 @@
public class EmergencyPlanLogRespDTO {
+ private String planName;
+
+ public String getPlanName() {
+ return planName;
+ }
+
+ public void setPlanName(String planName) {
+ this.planName = planName;
+ }
+
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
private Long id;
private Long planId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanLogService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanLogService.java
index 610b820..295876a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanLogService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanLogService.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.emergency.service;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
@@ -13,11 +14,11 @@
SearchResultVO<List<EmergencyPlanLogRespDTO>> selectEmergencyPlanLogList(PageQuery<EmergencyPlanLogQuery> query);
- ResultVO addEmergencyPlanLog(Long uid, EmergencyPlanLogReqDTO emergencyPlanLogReqDTO);
+ ResultVO addEmergencyPlanLog(ContextCacheUser currentUser, EmergencyPlanLogReqDTO emergencyPlanLogReqDTO);
ResultVO<EmergencyPlanLogRespDTO> getEmergencyPlanLogById(Long id);
ResultVO updateEmergencyPlanLog(Long uid, EmergencyPlanLogReqDTO emergencyPlanLogReqDTO);
- ResultVO batchDeleteEmergencyPlanLog(String ids);
+ ResultVO batchDeleteEmergencyPlanLog(Long[] ids);
}
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);
}
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 3c67fe8..6125300 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
@@ -8,13 +8,27 @@
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="plan_id" property="planId"/>
<result column="user_uid" property="userUid"/>
+ <result column="user_name" property="userName"/>
<result column="start_create" property="startCreate"/>
<result column="remark" property="remark"/>
</resultMap>
<select id="selectEmergencyPlanLogList" resultMap="emergencyPlanLogInfoDOResult">
- select id,`plan_id`,`user_uid`,`start_create`,`remark` from emergency_plan_log where del_flag = 0
- <if test="query.planId != null ">and `plan_id` = #{query.planId}</if>
+
+ SELECT
+ a.id,
+ a.`plan_id`,
+ a.`user_uid`,
+ a.user_name,
+ a.`start_create`,
+ a.`remark`,
+ b.`name` AS planName
+ FROM
+ emergency_plan_log a
+ LEFT JOIN emergency_plan b ON a.plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ <if test="query.planId != null ">and a.`plan_id` = #{query.planId}</if>
</select>
<insert id="addEmergencyPlanLog" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyPlanLogInfo"
@@ -29,6 +43,7 @@
<if test="updateUid != null ">update_uid,</if>
<if test="planId != null ">plan_id,</if>
<if test="userUid != null ">user_uid,</if>
+ <if test="userName != null and userName != ''">user_name,</if>
<if test="startCreate != null ">start_create,</if>
<if test="remark != null and remark != ''">remark,</if>
</trim>
@@ -41,6 +56,7 @@
<if test="updateUid != null ">#{updateUid},</if>
<if test="planId != null ">#{planId},</if>
<if test="userUid != null ">#{userUid},</if>
+ <if test="userName != null and userName != ''">#{userName},</if>
<if test="startCreate != null ">#{startCreate},</if>
<if test="remark != null and remark != ''">#{remark},</if>
</trim>
@@ -48,7 +64,21 @@
<select id="selectEmergencyPlanLogById" resultMap="emergencyPlanLogInfoDOResult">
- select id,`plan_id`,`user_uid`,`start_create`,`remark` from emergency_plan_log where del_flag = 0 and id = #{id}
+ SELECT
+ a.id,
+ a.`plan_id`,
+ a.`user_uid`,
+ a.user_name,
+ a.`start_create`,
+ a.`remark`,
+ b.`name` AS planName
+ FROM
+ emergency_plan_log a
+ LEFT JOIN emergency_plan b ON a.plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND a.id = #{id}
+
</select>
<update id="updateEmergencyPlanLog" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyPlanLogInfo">
@@ -58,6 +88,7 @@
<if test="updateUid != null ">update_uid = #{updateUid},</if>
<if test="planId != null ">plan_id = #{planId},</if>
<if test="userUid != null ">user_uid = #{userUid},</if>
+ <if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="startCreate != null ">start_create = #{startCreate},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
</trim>
--
Gitblit v1.9.2