From faa658a837ecb01f95618639c4536c91a5c65d1f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 10:55:59 +0800
Subject: [PATCH] 应急接口fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanTeamInfoDO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java | 10 +
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java | 1
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanTeamRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java | 10 +
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java | 1
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java | 10 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 218 +++++++++++++++++--------------
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDepartmentRespDTO.java | 10 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml | 12 +
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java | 1
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 9
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java | 10 +
23 files changed, 263 insertions(+), 113 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
index c240e31..98841a1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -61,8 +61,8 @@
/**
* 应急预案删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencyPlan(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencyPlan(@RequestBody Long[] ids){
return emergencyPlanService.batchDeleteEmergencyPlan(ids);
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
index e431781..eca6e69 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyTeamController.java
@@ -63,8 +63,8 @@
/**
* 应急队伍删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencyTeam(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencyTeam(@RequestBody Long[] ids){
return emergencyTeamService.batchDeleteEmergencyTeam(ids);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
index 24c80da..a8fb05a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
@@ -9,6 +9,16 @@
@TableName("emergency_plan")
public class EmergencyPlanInfo {
+ private String authorName;
+
+ public String getAuthorName() {
+ return authorName;
+ }
+
+ public void setAuthorName(String authorName) {
+ this.authorName = authorName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
index c7fded1..ed63c26 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_plan")
public class EmergencyPlanInfoDetailDO {
+ private String authorName;
+
+ public String getAuthorName() {
+ return authorName;
+ }
+
+ public void setAuthorName(String authorName) {
+ this.authorName = authorName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanTeamInfoDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanTeamInfoDO.java
index 4b60fd1..1c090d6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanTeamInfoDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanTeamInfoDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_plan_team")
public class EmergencyPlanTeamInfoDO {
+ private String teamName;
+
+ public String getTeamName() {
+ return teamName;
+ }
+
+ public void setTeamName(String teamName) {
+ this.teamName = teamName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
index 736ab0c..c54f6da 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
@@ -9,6 +9,16 @@
@TableName("emergency_team")
public class EmergencyTeamInfo {
+ private String principalName;
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
index b6f8552..cca920b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
@@ -10,6 +10,16 @@
@TableName("emergency_team")
public class EmergencyTeamInfoDetailDO {
+ private String principalName;
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
index 0a57857..d342880 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
@@ -7,6 +7,16 @@
public class EmergencyPlanReqDTO {
+ private String authorName;
+
+ public String getAuthorName() {
+ return authorName;
+ }
+
+ public void setAuthorName(String authorName) {
+ this.authorName = authorName;
+ }
+
private Long id;
private Integer status;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
index 1df9ec5..77ba093 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
@@ -4,6 +4,16 @@
public class EmergencyTeamReqDTO {
+ private String principalName;
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
private Long id;
private Long principalUid;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDepartmentRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDepartmentRespDTO.java
index 8236637..134b9ab 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDepartmentRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDepartmentRespDTO.java
@@ -3,6 +3,16 @@
public class EmergencyPlanDepartmentRespDTO {
+ private String departmentName;
+
+ public String getDepartmentName() {
+ return departmentName;
+ }
+
+ public void setDepartmentName(String departmentName) {
+ this.departmentName = departmentName;
+ }
+
private Long id;
private Long planId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java
index 30ed2ed..1f5c663 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java
@@ -7,6 +7,16 @@
public class EmergencyPlanDetailRespDTO {
+ private String authorName;
+
+ public String getAuthorName() {
+ return authorName;
+ }
+
+ public void setAuthorName(String authorName) {
+ this.authorName = authorName;
+ }
+
private Long id;
private Integer status;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanTeamRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanTeamRespDTO.java
index 77219b3..a7587a0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanTeamRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanTeamRespDTO.java
@@ -3,6 +3,16 @@
public class EmergencyPlanTeamRespDTO {
+ private String teamName;
+
+ public String getTeamName() {
+ return teamName;
+ }
+
+ public void setTeamName(String teamName) {
+ this.teamName = teamName;
+ }
+
private Long id;
private Long planId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
index c5a74bb..82e9abb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
@@ -5,6 +5,16 @@
public class EmergencyTeamDetailRespDTO {
+ private String principalName;
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
private Long id;
private Long principalUid;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java
index 07a32bc..08623f8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java
@@ -20,5 +20,5 @@
ResultVO updateEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO);
- ResultVO batchDeleteEmergencyPlan(String ids);
+ ResultVO batchDeleteEmergencyPlan(Long[] ids);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
index 14520f5..b00f7a4 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyTeamService.java
@@ -30,7 +30,7 @@
ResultVO getEmergencyTeamMemberById(Long id);
- ResultVO batchDeleteEmergencyTeam(String ids);
+ ResultVO batchDeleteEmergencyTeam(Long[] ids);
ResultVO getEmergencyTeamMemberByTeamId(Long teamId);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
index e7a62f1..7a823cc 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -17,14 +19,13 @@
import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
import com.gkhy.safePlatform.emergency.service.baseService.*;
+import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@Service("emergencyPlanService")
@@ -45,6 +46,9 @@
@Autowired
private EmergencyPlanFileInfoService emergencyPlanFileInfoService;
+ @DubboReference(check = false)
+ private AccountDepartmentService accountDepartmentService;
+
@Override
public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query) {
Long pageIndex = query.getPageIndex();
@@ -55,17 +59,17 @@
if (query.getSearchParams() != null) {
BeanUtils.copyProperties(query.getSearchParams(), emergencyPlanDBQuery);
}
- List<EmergencyPlanInfoPageDO> emergencyPlanListDoInfoList = emergencyPlanInfoService.selectEmergencyPlanList(page,emergencyPlanDBQuery);
- List<EmergencyPlanPageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyPlanListDoInfoList, EmergencyPlanPageRespDTO.class);
+ List<EmergencyPlanInfoPageDO> emergencyPlanListDoInfoList = emergencyPlanInfoService.selectEmergencyPlanList(page, emergencyPlanDBQuery);
+ List<EmergencyPlanPageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyPlanListDoInfoList, EmergencyPlanPageRespDTO.class);
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,page.getPages(),
+ pageSize, page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
- );
+ );
}
@Override
@@ -73,80 +77,80 @@
Date nowDate = new Date();
// 新增应急预案
EmergencyPlanInfo emergencyPlanInfo = new EmergencyPlanInfo();
- BeanUtils.copyProperties(emergencyPlanReqDTO,emergencyPlanInfo);
+ BeanUtils.copyProperties(emergencyPlanReqDTO, emergencyPlanInfo);
emergencyPlanInfo.setDelFlag(false);
emergencyPlanInfo.setCreateUid(uid);
emergencyPlanInfo.setGmtCreate(nowDate);
emergencyPlanInfo.setStatus(EmergencyPlanStatus.START.getStatus());
emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo);
// 新增应急预案区域表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())){
- addEmergencyPlanArea(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getAreaList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())) {
+ addEmergencyPlanArea(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getAreaList());
}
// 新增应急预案适用部门表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getDeptList())){
- addEmergencyPlanDepartment(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getDeptList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getDeptList())) {
+ addEmergencyPlanDepartment(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getDeptList());
}
// 新增应急预案附件表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getFileList())){
- addEmergencyPlanFile(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getFileList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getFileList())) {
+ addEmergencyPlanFile(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getFileList());
}
// 新增应急预案应急队伍表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getTeamList())){
- addEmergencyPlanTeam(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getTeamList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getTeamList())) {
+ addEmergencyPlanTeam(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getTeamList());
}
return new ResultVO<>(ResultCodes.OK);
}
- private void addEmergencyPlanArea(Long uid,Long planId, Date nowDate,List<EmergencyPlanAreaReqDTO> emergencyPlanAreaReqDTOList){
- List<EmergencyPlanAreaInfo> emergencyPlanAreaInfoList = BeanCopyUtils.copyBeanList(emergencyPlanAreaReqDTOList,EmergencyPlanAreaInfo.class);
- emergencyPlanAreaInfoList.forEach(EmergencyPlanAreaInfo->{
+ private void addEmergencyPlanArea(Long uid, Long planId, Date nowDate, List<EmergencyPlanAreaReqDTO> emergencyPlanAreaReqDTOList) {
+ List<EmergencyPlanAreaInfo> emergencyPlanAreaInfoList = BeanCopyUtils.copyBeanList(emergencyPlanAreaReqDTOList, EmergencyPlanAreaInfo.class);
+ emergencyPlanAreaInfoList.forEach(EmergencyPlanAreaInfo -> {
EmergencyPlanAreaInfo.setDelFlag(false);
EmergencyPlanAreaInfo.setCreateUid(uid);
EmergencyPlanAreaInfo.setGmtCreate(nowDate);
EmergencyPlanAreaInfo.setPlanId(planId);
});
- for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : emergencyPlanAreaInfoList){
+ for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : emergencyPlanAreaInfoList) {
emergencyPlanAreaInfoService.addEmergencyPlanArea(emergencyPlanAreaInfo);
}
}
- private void addEmergencyPlanDepartment(Long uid,Long planId, Date nowDate,List<EmergencyPlanDepartmentReqDTO> emergencyPlanDepartmentReqDTOList){
- List<EmergencyPlanDepartmentInfo> emergencyPlanDepartmentInfoList = BeanCopyUtils.copyBeanList(emergencyPlanDepartmentReqDTOList,EmergencyPlanDepartmentInfo.class);
- emergencyPlanDepartmentInfoList.forEach(EmergencyPlanDepartmentInfo->{
+ private void addEmergencyPlanDepartment(Long uid, Long planId, Date nowDate, List<EmergencyPlanDepartmentReqDTO> emergencyPlanDepartmentReqDTOList) {
+ List<EmergencyPlanDepartmentInfo> emergencyPlanDepartmentInfoList = BeanCopyUtils.copyBeanList(emergencyPlanDepartmentReqDTOList, EmergencyPlanDepartmentInfo.class);
+ emergencyPlanDepartmentInfoList.forEach(EmergencyPlanDepartmentInfo -> {
EmergencyPlanDepartmentInfo.setDelFlag(false);
EmergencyPlanDepartmentInfo.setCreateUid(uid);
EmergencyPlanDepartmentInfo.setGmtCreate(nowDate);
EmergencyPlanDepartmentInfo.setPlanId(planId);
});
- for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : emergencyPlanDepartmentInfoList){
+ for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : emergencyPlanDepartmentInfoList) {
emergencyPlanDepartmentInfoService.addEmergencyPlanDepartment(emergencyPlanDepartmentInfo);
}
}
- private void addEmergencyPlanFile(Long uid,Long planId, Date nowDate,List<EmergencyPlanFileReqDTO> emergencyPlanFileReqDTOList){
- List<EmergencyPlanFileInfo> emergencyPlanFileInfoList = BeanCopyUtils.copyBeanList(emergencyPlanFileReqDTOList,EmergencyPlanFileInfo.class);
- emergencyPlanFileInfoList.forEach(EmergencyPlanFileInfo->{
+ private void addEmergencyPlanFile(Long uid, Long planId, Date nowDate, List<EmergencyPlanFileReqDTO> emergencyPlanFileReqDTOList) {
+ List<EmergencyPlanFileInfo> emergencyPlanFileInfoList = BeanCopyUtils.copyBeanList(emergencyPlanFileReqDTOList, EmergencyPlanFileInfo.class);
+ emergencyPlanFileInfoList.forEach(EmergencyPlanFileInfo -> {
EmergencyPlanFileInfo.setDelFlag(false);
EmergencyPlanFileInfo.setCreateUid(uid);
EmergencyPlanFileInfo.setGmtCreate(nowDate);
EmergencyPlanFileInfo.setPlanId(planId);
});
- for (EmergencyPlanFileInfo emergencyPlanFileInfo : emergencyPlanFileInfoList){
+ for (EmergencyPlanFileInfo emergencyPlanFileInfo : emergencyPlanFileInfoList) {
emergencyPlanFileInfoService.addEmergencyPlanFile(emergencyPlanFileInfo);
}
}
- private void addEmergencyPlanTeam(Long uid,Long planId, Date nowDate,List<EmergencyPlanTeamReqDTO> emergencyPlanTeamReqDTOList){
- List<EmergencyPlanTeamInfo> emergencyPlanTeamInfoList = BeanCopyUtils.copyBeanList(emergencyPlanTeamReqDTOList,EmergencyPlanTeamInfo.class);
- emergencyPlanTeamInfoList.forEach(EmergencyPlanTeamInfo->{
+ private void addEmergencyPlanTeam(Long uid, Long planId, Date nowDate, List<EmergencyPlanTeamReqDTO> emergencyPlanTeamReqDTOList) {
+ List<EmergencyPlanTeamInfo> emergencyPlanTeamInfoList = BeanCopyUtils.copyBeanList(emergencyPlanTeamReqDTOList, EmergencyPlanTeamInfo.class);
+ emergencyPlanTeamInfoList.forEach(EmergencyPlanTeamInfo -> {
EmergencyPlanTeamInfo.setDelFlag(false);
EmergencyPlanTeamInfo.setCreateUid(uid);
EmergencyPlanTeamInfo.setGmtCreate(nowDate);
EmergencyPlanTeamInfo.setPlanId(planId);
});
- for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : emergencyPlanTeamInfoList){
+ for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : emergencyPlanTeamInfoList) {
emergencyPlanTeamInfoService.addEmergencyPlanTeam(emergencyPlanTeamInfo);
}
}
@@ -156,36 +160,52 @@
EmergencyPlanDetailRespDTO emergencyPlanDetailRespDTO = new EmergencyPlanDetailRespDTO();
// 查询是否存在
EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(id);
- if (emergencyPlanInfoDetailDO==null){
+ if (emergencyPlanInfoDetailDO == null) {
throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST);
- }else{
- BeanUtils.copyProperties(emergencyPlanInfoDetailDO,emergencyPlanDetailRespDTO);
+ } else {
+ BeanUtils.copyProperties(emergencyPlanInfoDetailDO, emergencyPlanDetailRespDTO);
// 查找对应的区域
List<EmergencyPlanAreaInfoDO> emergencyPlanAreaInfoDOList = emergencyPlanAreaInfoService.selectEmergencyPlanAreaByPlanId(id);
- if (!CollectionUtils.isEmpty(emergencyPlanAreaInfoDOList)){
- List<EmergencyPlanAreaRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanAreaInfoDOList , EmergencyPlanAreaRespDTO.class);
+ if (!CollectionUtils.isEmpty(emergencyPlanAreaInfoDOList)) {
+ List<EmergencyPlanAreaRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanAreaInfoDOList, EmergencyPlanAreaRespDTO.class);
emergencyPlanDetailRespDTO.setAreaList(emergencyTeamFileRespDTOList);
}
// 查找对应的适用部门
List<EmergencyPlanDepartmentInfoDO> emergencyPlanDepartmentInfoDOList = emergencyPlanDepartmentInfoService.selectEmergencyPlanDepartmentByPlanId(id);
- if (!CollectionUtils.isEmpty(emergencyPlanDepartmentInfoDOList)){
- List<EmergencyPlanDepartmentRespDTO> emergencyTeamDepartmentRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanDepartmentInfoDOList , EmergencyPlanDepartmentRespDTO.class);
+ if (!CollectionUtils.isEmpty(emergencyPlanDepartmentInfoDOList)) {
+ List<EmergencyPlanDepartmentRespDTO> emergencyTeamDepartmentRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanDepartmentInfoDOList, EmergencyPlanDepartmentRespDTO.class);
+
+ Map<Long, String> deptPool = new HashMap<>();
+ for (EmergencyPlanDepartmentRespDTO emergencyPlanDepartmentRespDTO : emergencyTeamDepartmentRespDTOList) {
+ if (!deptPool.containsKey(emergencyPlanDepartmentRespDTO.getDepartmentId())) {
+ ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(emergencyPlanDepartmentRespDTO.getDepartmentId());
+ if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
+ if (rpcResult.getData() != null) {
+ DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData();
+
+ deptPool.put(dep.getDepId(), dep.getDepName());
+ }
+ }
+ }
+ String depName = deptPool.get(emergencyPlanDepartmentRespDTO.getDepartmentId());
+ emergencyPlanDepartmentRespDTO.setDepartmentName(depName);
+ }
emergencyPlanDetailRespDTO.setDeptList(emergencyTeamDepartmentRespDTOList);
}
// 查找对应的应急队伍
List<EmergencyPlanTeamInfoDO> emergencyPlanTeamInfoDOList = emergencyPlanTeamInfoService.selectEmergencyPlanTeamByPlanId(id);
- if (!CollectionUtils.isEmpty(emergencyPlanTeamInfoDOList)){
- List<EmergencyPlanTeamRespDTO> emergencyTeamTeamRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanTeamInfoDOList , EmergencyPlanTeamRespDTO.class);
+ if (!CollectionUtils.isEmpty(emergencyPlanTeamInfoDOList)) {
+ List<EmergencyPlanTeamRespDTO> emergencyTeamTeamRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanTeamInfoDOList, EmergencyPlanTeamRespDTO.class);
emergencyPlanDetailRespDTO.setTeamList(emergencyTeamTeamRespDTOList);
}
// 查找对应的附件
List<EmergencyPlanFileInfoDO> emergencyPlanFileInfoDOList = emergencyPlanFileInfoService.selectEmergencyPlanFileByPlanId(id);
- if (!CollectionUtils.isEmpty(emergencyPlanFileInfoDOList)){
- List<EmergencyPlanFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanFileInfoDOList , EmergencyPlanFileRespDTO.class);
+ if (!CollectionUtils.isEmpty(emergencyPlanFileInfoDOList)) {
+ List<EmergencyPlanFileRespDTO> emergencyTeamFileRespDTOList = BeanCopyUtils.copyBeanList(emergencyPlanFileInfoDOList, EmergencyPlanFileRespDTO.class);
emergencyPlanDetailRespDTO.setFileList(emergencyTeamFileRespDTOList);
}
- return new ResultVO<>(ResultCodes.OK,emergencyPlanDetailRespDTO);
+ return new ResultVO<>(ResultCodes.OK, emergencyPlanDetailRespDTO);
}
}
@@ -194,30 +214,30 @@
Date nowDate = new Date();
// 查询是否存在
EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(emergencyPlanReqDTO.getId());
- if (emergencyPlanInfoDetailDO==null){
+ if (emergencyPlanInfoDetailDO == null) {
throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST);
- }else{
+ } else {
EmergencyPlanInfo emergencyPlanInfo = new EmergencyPlanInfo();
- BeanUtils.copyProperties(emergencyPlanReqDTO,emergencyPlanInfo);
+ BeanUtils.copyProperties(emergencyPlanReqDTO, emergencyPlanInfo);
emergencyPlanInfo.setUpdateUid(uid);
emergencyPlanInfo.setGmtModitify(nowDate);
emergencyPlanInfoService.updateEmergencyPlan(emergencyPlanInfo);
// 更新应急预案区域表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())){
- updateEmergencyPlanArea(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getAreaList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())) {
+ updateEmergencyPlanArea(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getAreaList());
}
// 更新应急预案适用部门表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getDeptList())){
- updateEmergencyPlanDepartment(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getDeptList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getDeptList())) {
+ updateEmergencyPlanDepartment(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getDeptList());
}
// 更新应急预案附件表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getFileList())){
- updateEmergencyPlanFile(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getFileList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getFileList())) {
+ updateEmergencyPlanFile(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getFileList());
}
// 更新应急预案应急队伍表
- if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getTeamList())){
- updateEmergencyPlanTeam(uid,emergencyPlanInfo.getId(),nowDate,emergencyPlanReqDTO.getTeamList());
+ if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getTeamList())) {
+ updateEmergencyPlanTeam(uid, emergencyPlanInfo.getId(), nowDate, emergencyPlanReqDTO.getTeamList());
}
return new ResultVO<>(ResultCodes.OK);
@@ -233,11 +253,11 @@
List<EmergencyPlanAreaInfo> addList = new ArrayList<>();
//删除的区域集合(id)
List<Long> deleteList = new ArrayList<>();
- for (EmergencyPlanAreaReqDTO emergencyPlanAreaReqDTO : areaReqDTOList){
+ for (EmergencyPlanAreaReqDTO emergencyPlanAreaReqDTO : areaReqDTOList) {
//如果不存在id则表示页面新增的附件
- if (emergencyPlanAreaReqDTO.getId() == null){
+ if (emergencyPlanAreaReqDTO.getId() == null) {
EmergencyPlanAreaInfo emergencyPlanAreaInfo = new EmergencyPlanAreaInfo();
- BeanUtils.copyProperties(emergencyPlanAreaReqDTO,emergencyPlanAreaInfo);
+ BeanUtils.copyProperties(emergencyPlanAreaReqDTO, emergencyPlanAreaInfo);
emergencyPlanAreaInfo.setDelFlag(false);
emergencyPlanAreaInfo.setGmtCreate(nowDate);
emergencyPlanAreaInfo.setCreateUid(uid);
@@ -245,21 +265,21 @@
addList.add(emergencyPlanAreaInfo);
}
//如果存在id则判断页面是否删除
- else{
+ else {
newIdsList.add(emergencyPlanAreaReqDTO.getId());
}
}
- for (Long oldId : oldIdsList){
- if (!newIdsList.contains(oldId)){
+ for (Long oldId : oldIdsList) {
+ if (!newIdsList.contains(oldId)) {
deleteList.add(oldId);
}
}
- if (!CollectionUtils.isEmpty(addList)){
- for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : addList){
+ if (!CollectionUtils.isEmpty(addList)) {
+ for (EmergencyPlanAreaInfo emergencyPlanAreaInfo : addList) {
emergencyPlanAreaInfoService.addEmergencyPlanArea(emergencyPlanAreaInfo);
}
}
- if (!CollectionUtils.isEmpty(deleteList)){
+ if (!CollectionUtils.isEmpty(deleteList)) {
emergencyPlanAreaInfoService.deleteEmergencyPlanAreaByIds(deleteList);
}
}
@@ -273,11 +293,11 @@
List<EmergencyPlanDepartmentInfo> addList = new ArrayList<>();
//删除的区域集合(id)
List<Long> deleteList = new ArrayList<>();
- for (EmergencyPlanDepartmentReqDTO emergencyPlanDepartmentReqDTO : departmentReqDTOList){
+ for (EmergencyPlanDepartmentReqDTO emergencyPlanDepartmentReqDTO : departmentReqDTOList) {
//如果不存在id则表示页面新增的附件
- if (emergencyPlanDepartmentReqDTO.getId() == null){
+ if (emergencyPlanDepartmentReqDTO.getId() == null) {
EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo = new EmergencyPlanDepartmentInfo();
- BeanUtils.copyProperties(emergencyPlanDepartmentReqDTO,emergencyPlanDepartmentInfo);
+ BeanUtils.copyProperties(emergencyPlanDepartmentReqDTO, emergencyPlanDepartmentInfo);
emergencyPlanDepartmentInfo.setDelFlag(false);
emergencyPlanDepartmentInfo.setGmtCreate(nowDate);
emergencyPlanDepartmentInfo.setCreateUid(uid);
@@ -285,21 +305,21 @@
addList.add(emergencyPlanDepartmentInfo);
}
//如果存在id则判断页面是否删除
- else{
+ else {
newIdsList.add(emergencyPlanDepartmentReqDTO.getId());
}
}
- for (Long oldId : oldIdsList){
- if (!newIdsList.contains(oldId)){
+ for (Long oldId : oldIdsList) {
+ if (!newIdsList.contains(oldId)) {
deleteList.add(oldId);
}
}
- if (!CollectionUtils.isEmpty(addList)){
- for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : addList){
+ if (!CollectionUtils.isEmpty(addList)) {
+ for (EmergencyPlanDepartmentInfo emergencyPlanDepartmentInfo : addList) {
emergencyPlanDepartmentInfoService.addEmergencyPlanDepartment(emergencyPlanDepartmentInfo);
}
}
- if (!CollectionUtils.isEmpty(deleteList)){
+ if (!CollectionUtils.isEmpty(deleteList)) {
emergencyPlanDepartmentInfoService.deleteEmergencyPlanDepartmentByIds(deleteList);
}
}
@@ -313,11 +333,11 @@
List<EmergencyPlanFileInfo> addList = new ArrayList<>();
//删除的区域集合(id)
List<Long> deleteList = new ArrayList<>();
- for (EmergencyPlanFileReqDTO emergencyPlanFileReqDTO : fileReqDTOList){
+ for (EmergencyPlanFileReqDTO emergencyPlanFileReqDTO : fileReqDTOList) {
//如果不存在id则表示页面新增的附件
- if (emergencyPlanFileReqDTO.getId() == null){
+ if (emergencyPlanFileReqDTO.getId() == null) {
EmergencyPlanFileInfo emergencyPlanFileInfo = new EmergencyPlanFileInfo();
- BeanUtils.copyProperties(emergencyPlanFileReqDTO,emergencyPlanFileInfo);
+ BeanUtils.copyProperties(emergencyPlanFileReqDTO, emergencyPlanFileInfo);
emergencyPlanFileInfo.setDelFlag(false);
emergencyPlanFileInfo.setGmtCreate(nowDate);
emergencyPlanFileInfo.setCreateUid(uid);
@@ -325,21 +345,21 @@
addList.add(emergencyPlanFileInfo);
}
//如果存在id则判断页面是否删除
- else{
+ else {
newIdsList.add(emergencyPlanFileReqDTO.getId());
}
}
- for (Long oldId : oldIdsList){
- if (!newIdsList.contains(oldId)){
+ for (Long oldId : oldIdsList) {
+ if (!newIdsList.contains(oldId)) {
deleteList.add(oldId);
}
}
- if (!CollectionUtils.isEmpty(addList)){
- for (EmergencyPlanFileInfo emergencyPlanFileInfo : addList){
+ if (!CollectionUtils.isEmpty(addList)) {
+ for (EmergencyPlanFileInfo emergencyPlanFileInfo : addList) {
emergencyPlanFileInfoService.addEmergencyPlanFile(emergencyPlanFileInfo);
}
}
- if (!CollectionUtils.isEmpty(deleteList)){
+ if (!CollectionUtils.isEmpty(deleteList)) {
emergencyPlanFileInfoService.deleteEmergencyPlanFileByIds(deleteList);
}
}
@@ -353,11 +373,11 @@
List<EmergencyPlanTeamInfo> addList = new ArrayList<>();
//删除的区域集合(id)
List<Long> deleteList = new ArrayList<>();
- for (EmergencyPlanTeamReqDTO emergencyPlanTeamReqDTO : teamReqDTOList){
+ for (EmergencyPlanTeamReqDTO emergencyPlanTeamReqDTO : teamReqDTOList) {
//如果不存在id则表示页面新增的附件
- if (emergencyPlanTeamReqDTO.getId() == null){
+ if (emergencyPlanTeamReqDTO.getId() == null) {
EmergencyPlanTeamInfo emergencyPlanTeamInfo = new EmergencyPlanTeamInfo();
- BeanUtils.copyProperties(emergencyPlanTeamReqDTO,emergencyPlanTeamInfo);
+ BeanUtils.copyProperties(emergencyPlanTeamReqDTO, emergencyPlanTeamInfo);
emergencyPlanTeamInfo.setDelFlag(false);
emergencyPlanTeamInfo.setGmtCreate(nowDate);
emergencyPlanTeamInfo.setCreateUid(uid);
@@ -365,33 +385,33 @@
addList.add(emergencyPlanTeamInfo);
}
//如果存在id则判断页面是否删除
- else{
+ else {
newIdsList.add(emergencyPlanTeamReqDTO.getId());
}
}
- for (Long oldId : oldIdsList){
- if (!newIdsList.contains(oldId)){
+ for (Long oldId : oldIdsList) {
+ if (!newIdsList.contains(oldId)) {
deleteList.add(oldId);
}
}
- if (!CollectionUtils.isEmpty(addList)){
- for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : addList){
+ if (!CollectionUtils.isEmpty(addList)) {
+ for (EmergencyPlanTeamInfo emergencyPlanTeamInfo : addList) {
emergencyPlanTeamInfoService.addEmergencyPlanTeam(emergencyPlanTeamInfo);
}
}
- if (!CollectionUtils.isEmpty(deleteList)){
+ if (!CollectionUtils.isEmpty(deleteList)) {
emergencyPlanTeamInfoService.deleteEmergencyPlanTeamByIds(deleteList);
}
}
@Override
- public ResultVO batchDeleteEmergencyPlan(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencyPlan(Long[] ids) {
+
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyPlan(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencyPlan(id);
}
return new ResultVO(ResultCodes.OK);
}
@@ -400,9 +420,9 @@
private void deleteEmergencyPlan(Long id) {
//查询是否存在
EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(id);
- if (emergencyPlanInfoDetailDO==null){
+ if (emergencyPlanInfoDetailDO == null) {
throw new EmergencyException(EmergencyResultCodes.PLAN_NOT_EXIST);
- }else{
+ } else {
Long PlanId = emergencyPlanInfoDetailDO.getId();
emergencyPlanInfoService.deleteEmergencyPlan(PlanId);
//删除区域
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index 471a9d2..cd315a8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -245,13 +245,12 @@
}
@Override
- public ResultVO batchDeleteEmergencyTeam(String ids) {
- if (StringUtils.isBlank(ids)){
+ public ResultVO batchDeleteEmergencyTeam(Long[] ids) {
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.TEAM_NULL);
}else{
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencyTeam(Long.valueOf(id));
+ for (Long id : ids){
+ deleteEmergencyTeam(id);
}
return new ResultVO(ResultCodes.OK);
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
index 364caa7..57460fa 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
@@ -32,6 +32,7 @@
<if test="status != null ">status,</if>
<if test="releaseDate != null ">release_date,</if>
<if test="authorUid != null ">author_uid,</if>
+ <if test="authorName != null and authorName != ''">`author_name`,</if>
<if test="authorDeptId != null ">author_dept_id,</if>
<if test="associatedDanger != null ">associated_danger,</if>
<if test="type != null and type != ''">`type`,</if>
@@ -48,6 +49,7 @@
<if test="status != null ">#{status},</if>
<if test="releaseDate != null ">#{releaseDate},</if>
<if test="authorUid != null ">#{authorUid},</if>
+ <if test="authorName != null and authorName != ''">#{authorName},</if>
<if test="authorDeptId != null ">#{authorDeptId},</if>
<if test="associatedDanger!= null ">#{associatedDanger},</if>
<if test="type != null and type != ''">#{type},</if>
@@ -65,12 +67,13 @@
<result column="level" property="level"/>
<result column="release_date" property="releaseDate"/>
<result column="author_uid" property="authorUid"/>
+ <result column="author_name" property="authorName"/>
<result column="author_dept_id" property="authorDeptId"/>
<result column="associated_danger" property="associatedDanger"/>
</resultMap>
<select id="selectEmergencyPlanById" resultMap="emergencyPlanInfoDetailDOResult">
- select id ,`name`,`status`,`type`,`level`,release_date ,author_uid ,author_dept_id ,associated_danger from emergency_plan
+ select id ,`name`,`status`,`type`,`level`,release_date ,author_uid ,author_dept_id ,associated_danger,author_name from emergency_plan
where del_flag = 0 and id = #{id}
</select>
@@ -82,6 +85,7 @@
<if test="status != null ">status = #{status},</if>
<if test="releaseDate != null ">release_date = #{releaseDate},</if>
<if test="authorUid != null ">author_uid = #{authorUid},</if>
+ <if test="authorName != null and authorName != ''">author_name =#{authorName},</if>
<if test="authorDeptId != null ">author_dept_id = #{authorDeptId},</if>
<if test="associatedDanger != null ">associated_danger = #{associatedDanger},</if>
<if test="type != null and type != ''">type = #{type},</if>
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 f12ee88..97f5b01 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,17 @@
</resultMap>
<select id="selectEmergencyPlanTeamByPlanId" resultMap="emergencyPlanTeamInfoDOResult">
- select id ,plan_id ,team_id from emergency_plan_team where plan_id=#{planId} and del_flag = 0
+ SELECT
+ a.id,
+ a.plan_id,
+ a.team_id,
+ b.team_name AS teamName
+ FROM
+ emergency_plan_team a
+ LEFT JOIN emergency_team b ON a.team_id = b.id
+ WHERE
+ a.plan_id = #{planId}
+ AND a.del_flag = 0
</select>
<update id = "deleteEmergencyPlanTeamByIds" >
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
index 6698f5a..350748f 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyTeamInfoMapper.xml
@@ -29,6 +29,7 @@
<if test="createUid != null ">create_uid,</if>
<if test="updateUid != null ">update_uid,</if>
<if test="principalUid != null ">principal_uid,</if>
+ <if test="principalName != null and principalName != ''">principal_name,</if>
<if test="principalDepartmentId != null ">principal_department_id,</if>
<if test="teamLevel != null and teamLevel != ''">team_level,</if>
<if test="teamName != null and teamName != ''">team_name,</if>
@@ -44,6 +45,7 @@
<if test="createUid != null ">#{createUid},</if>
<if test="updateUid != null ">#{updateUid},</if>
<if test="principalUid != null ">#{principalUid},</if>
+ <if test="principalName != null and principalName != ''">#{principalName},</if>
<if test="principalDepartmentId != null ">#{principalDepartmentId},</if>
<if test="teamLevel != null and teamLevel != ''">#{teamLevel},</if>
<if test="teamName != null and teamName != ''">#{teamName},</if>
@@ -57,6 +59,7 @@
id="emergencyTeamInfoDetailDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="principal_uid" property="principalUid"/>
+ <result column="principal_name" property="principalName"/>
<result column="principal_department_id" property="principalDepartmentId"/>
<result column="team_level" property="teamLevel"/>
<result column="team_name" property="teamName"/>
@@ -66,7 +69,7 @@
</resultMap>
<select id="selectEmergencyTeamById" resultMap="emergencyTeamInfoDetailDOResult">
- select id,principal_uid,principal_department_id,`team_level`,`team_name`,`principal_phone`,telephone_number,`team_desc`
+ select id,principal_uid,principal_department_id,`team_level`,`team_name`,`principal_phone`,telephone_number,`team_desc`,principal_name
from emergency_team where del_flag = 0 and id = #{id}
</select>
@@ -76,6 +79,7 @@
<if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
<if test="updateUid != null ">update_uid = #{updateUid},</if>
<if test="principalUid != null ">principal_uid = #{principalUid},</if>
+ <if test="principalName != null and principalName != ''">principal_name = #{principalName},</if>
<if test="principalDepartmentId != null ">principal_department_id = #{principalDepartmentId},</if>
<if test="teamLevel != null and teamLevel != ''">team_level = #{teamLevel},</if>
<if test="teamName != null and teamName != ''">team_name = #{teamName},</if>
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
index 177d3dd..5ceded1 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
@@ -29,6 +29,7 @@
private String accidentCause;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date occurrenceTime;
private String occurrencePlace;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
index 6afa48d..add7477 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
@@ -36,6 +36,7 @@
private String accidentCause;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date reportDeadline;
private String accidentLevel;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
index c8521d1..6402836 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/WorkInjuryDeclarationReqDTO.java
@@ -20,6 +20,7 @@
private String workInjuryType;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date declareDate;
private BigDecimal lostTime;
--
Gitblit v1.9.2