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/service/impl/EmergencyPlanServiceImpl.java | 218 +++++++++++++++++++++++++++++------------------------
1 files changed, 119 insertions(+), 99 deletions(-)
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);
//删除区域
--
Gitblit v1.9.2