From 5a952656d5c6217e13b4ce1eba45ffd74175d59a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 16:08:04 +0800
Subject: [PATCH] 应急实施fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 11 +--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java | 10 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java | 10 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteUserReqDTO.java | 10 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java | 4
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 6 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfo.java | 10 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java | 10 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteUserRespDTO.java | 10 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java | 31 ----------
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml | 5 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfoDO.java | 10 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfo.java | 10 +++
14 files changed, 98 insertions(+), 41 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
index 18c284f..44cd1eb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
@@ -61,8 +61,8 @@
/**
* 应急演练实施删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencyDrillExecute(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencyDrillExecute(@RequestBody Long[] ids){
return emergencyDrillExecuteService.batchDeleteEmergencyDrillExecute(ids);
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfo.java
index 79b8845..b10626f 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfo.java
@@ -9,6 +9,16 @@
@TableName("emergency_drill_execute")
public class EmergencyDrillExecuteInfo {
+ private String recordUserName;
+
+ public String getRecordUserName() {
+ return recordUserName;
+ }
+
+ public void setRecordUserName(String recordUserName) {
+ this.recordUserName = recordUserName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java
index c9762ee..43d3e5a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoDetailDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_drill_execute")
public class EmergencyDrillExecuteInfoDetailDO {
+ private String recordUserName;
+
+ public String getRecordUserName() {
+ return recordUserName;
+ }
+
+ public void setRecordUserName(String recordUserName) {
+ this.recordUserName = recordUserName;
+ }
+
private String drillName;
public String getDrillName() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfo.java
index 0fd767a..f5c51f0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfo.java
@@ -9,6 +9,16 @@
@TableName("emergency_drill_execute_user")
public class EmergencyDrillExecuteUserInfo {
+ 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/EmergencyDrillExecuteUserInfoDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfoDO.java
index e7b9206..9e3d346 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfoDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteUserInfoDO.java
@@ -7,6 +7,16 @@
@TableName("emergency_drill_execute_user")
public class EmergencyDrillExecuteUserInfoDO {
+ 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/req/EmergencyDrillExecuteReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
index e8baaad..37261da 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
@@ -8,6 +8,16 @@
public class EmergencyDrillExecuteReqDTO {
+ private String recordUserName;
+
+ public String getRecordUserName() {
+ return recordUserName;
+ }
+
+ public void setRecordUserName(String recordUserName) {
+ this.recordUserName = recordUserName;
+ }
+
private Long id;
private Boolean status;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteUserReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteUserReqDTO.java
index 0ddce80..05d638c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteUserReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteUserReqDTO.java
@@ -3,6 +3,16 @@
public class EmergencyDrillExecuteUserReqDTO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
private Long id;
private Long drillExecuteId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
index 630454e..70309b5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
@@ -8,6 +8,16 @@
public class EmergencyDrillExecuteDetailRespDTO {
+ private String recordUserName;
+
+ public String getRecordUserName() {
+ return recordUserName;
+ }
+
+ public void setRecordUserName(String recordUserName) {
+ this.recordUserName = recordUserName;
+ }
+
private String drillName;
public String getDrillName() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
index e3b0c8a..444535d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
@@ -76,10 +76,6 @@
private Long drillPlanId;
- private Long recordUserUid;
-
- private String processDesc;
-
public Long getId() {
return id;
}
@@ -112,32 +108,5 @@
this.drillPlanId = drillPlanId;
}
- public Long getRecordUserUid() {
- return recordUserUid;
- }
- public void setRecordUserUid(Long recordUserUid) {
- this.recordUserUid = recordUserUid;
- }
-
- public String getProcessDesc() {
- return processDesc;
- }
-
- public void setProcessDesc(String processDesc) {
- this.processDesc = processDesc;
- }
-
-
- @Override
- public String toString() {
- return "EmergencyDrillExecuteReqDTO{" +
- "id=" + id +
- ", status=" + status +
- ", drillRecordDate=" + drillRecordDate +
- ", drillPlanId=" + drillPlanId +
- ", recordUserUid=" + recordUserUid +
- ", processDesc='" + processDesc + '\'' +
- '}';
- }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteUserRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteUserRespDTO.java
index 7d507e8..9247c19 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteUserRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteUserRespDTO.java
@@ -3,6 +3,16 @@
public class EmergencyDrillExecuteUserRespDTO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
private Long id;
private Long drillExecuteId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java
index c523658..a22bdc6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java
@@ -20,5 +20,5 @@
ResultVO updateEmergencyDrillExecute(Long uid, EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO);
- ResultVO batchDeleteEmergencyDrillExecute(String ids);
+ ResultVO batchDeleteEmergencyDrillExecute(Long[] ids);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
index 655471e..b8a24ff 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
@@ -196,13 +196,12 @@
}
@Override
- public ResultVO batchDeleteEmergencyDrillExecute(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencyDrillExecute(Long[] ids) {
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyDrillExecute(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencyDrillExecute(id);
}
return new ResultVO(ResultCodes.OK);
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index 6d51303..692a495 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -17,6 +17,7 @@
<select id="selectEmergencyDrillExecuteList" resultMap="emergencyDrillExecuteInfoPageDOResult">
SELECT
a.id,
+ a.drill_plan_id,
b.drill_name as drillName,
b.drill_address as drillAddress,
b.drill_way as drillWay,
@@ -46,6 +47,7 @@
<if test="drillRecordDate != null ">drill_record_date,</if>
<if test="drillPlanId != null ">drill_plan_id,</if>
<if test="recordUserUid != null ">record_user_uid,</if>
+ <if test="recordUserName != null and recordUserName != ''">`record_user_name`,</if>
<if test="processDesc != null and processDesc != ''">`process_desc`,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -59,6 +61,7 @@
<if test="drillRecordDate != null ">#{drillRecordDate},</if>
<if test="drillPlanId != null ">#{drillPlanId},</if>
<if test="recordUserUid != null ">#{recordUserUid},</if>
+ <if test="recordUserName != null and recordUserName != ''">#{recordUserName},</if>
<if test="processDesc != null and processDesc != ''">#{processDesc},</if>
</trim>
</insert>
@@ -71,6 +74,7 @@
<result column="drill_record_date" property="drillRecordDate"/>
<result column="drill_plan_id" property="drillPlanId"/>
<result column="record_user_uid" property="recordUserUid"/>
+ <result column="record_user_name" property="recordUserName"/>
<result column="process_desc" property="processDesc"/>
</resultMap>
@@ -81,6 +85,7 @@
a.`drill_record_date`,
a.`drill_plan_id`,
a.`record_user_uid`,
+ a.record_user_name,
a.process_desc,
b.drill_name AS drillName
FROM
@@ -100,6 +105,7 @@
<if test="drillRecordDate != null ">drill_record_date=#{drillRecordDate},</if>
<if test="drillPlanId != null ">drill_plan_id=#{drillPlanId},</if>
<if test="recordUserUid != null ">record_user_uid=#{recordUserUid},</if>
+ <if test="recordUserName != null and recordUserName != ''">record_user_name = #{recordUserName},</if>
<if test="processDesc != null and processDesc != ''">process_desc=#{processDesc},</if>
</trim>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
index 95f0b46..74f6761 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
@@ -15,6 +15,7 @@
<if test="updateUid != null ">update_uid,</if>
<if test="drillExecuteId != null ">drill_execute_id,</if>
<if test="userUid != null ">user_uid,</if>
+ <if test="userName != null and userName != ''">`user_name`,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null ">#{id},</if>
@@ -25,6 +26,7 @@
<if test="updateUid != null ">#{updateUid},</if>
<if test="drillExecuteId != null ">#{drillExecuteId},</if>
<if test="userUid != null ">#{userUid},</if>
+ <if test="userName != null and userName != ''">#{userName},</if>
</trim>
</insert>
@@ -32,10 +34,11 @@
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="drill_execute_id" property="drillExecuteId" />
<result column="user_uid" property="userUid" />
+ <result column="user_name" property="userName" />
</resultMap>
<select id="selectEmergencyDrillExecuteUserByDrillExecuteId" resultMap="emergencyDrillExecuteUserInfoDOResult">
- select id,`drill_execute_id`,`user_uid` from emergency_drill_execute_user where del_flag = 0 and drill_execute_id = #{drillExecuteId}
+ select id,`drill_execute_id`,`user_uid`,`user_name` from emergency_drill_execute_user where del_flag = 0 and drill_execute_id = #{drillExecuteId}
</select>
<update id = "deleteEmergencyDrillExecuteUserByIds" >
--
Gitblit v1.9.2