应急接口fix

songhuangfeng123

2022-08-03 faa658a837ecb01f95618639c4536c91a5c65d1f

 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")
@@ -44,6 +45,9 @@

    @Autowired
    private EmergencyPlanFileInfoService emergencyPlanFileInfoService;

    @DubboReference(check = false)
    private AccountDepartmentService accountDepartmentService;

    @Override
    public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query) {
@@ -171,6 +175,22 @@
            List<EmergencyPlanDepartmentInfoDO> emergencyPlanDepartmentInfoDOList = emergencyPlanDepartmentInfoService.selectEmergencyPlanDepartmentByPlanId(id);
            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);
            }
            // 查找对应的应急队伍
@@ -385,13 +405,13 @@
    }

    @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));
            for (Long id : ids){
                deleteEmergencyPlan(id);
            }
            return new ResultVO(ResultCodes.OK);
        }