删除物资接口fix

songhuangfeng123

2022-08-05 d887d1db33d88948c71c5af670033382079bb250

删除物资接口fix

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesInspectInfoRepository.java

@@ -23,4 +23,6 @@
    void updateEmergencySuppliesInspect(EmergencySuppliesInspectInfo emergencySuppliesInspectInfo);

    void deleteEmergencySuppliesInspect(@Param("id") Long id);

    void deleteBySuppliesId(@Param("id")Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesMaintainInfoRepository.java

@@ -23,4 +23,6 @@
    void updateEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo);

    void deleteEmergencySuppliesMaintain(@Param("id") Long id);

    void deleteBySuppliesId(@Param("id")Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesInspectInfoService.java

@@ -21,4 +21,6 @@
    void updateEmergencySuppliesInspect(EmergencySuppliesInspectInfo emergencySuppliesInspectInfo);

    void deleteEmergencySuppliesInspect(Long SuppliesInspectId);

    void deleteBySuppliesId(Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesMaintainInfoService.java

@@ -21,4 +21,6 @@
    void updateEmergencySuppliesMaintain(EmergencySuppliesMaintainInfo emergencySuppliesMaintainInfo);

    void deleteEmergencySuppliesMaintain(Long SuppliesMaintainId);

    void deleteBySuppliesId(Long id);
}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInspectInfoServiceImpl.java

@@ -44,5 +44,10 @@
        emergencySuppliesInspectInfoRepository.deleteEmergencySuppliesInspect(SuppliesInspectId);
    }

    @Override
    public void deleteBySuppliesId(Long id) {
        emergencySuppliesInspectInfoRepository.deleteBySuppliesId(id);
    }


}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesMaintainInfoServiceImpl.java

@@ -44,5 +44,10 @@
        emergencySuppliesMaintainInfoRepository.deleteEmergencySuppliesMaintain(SuppliesMaintainId);
    }

    @Override
    public void deleteBySuppliesId(Long id) {
        emergencySuppliesMaintainInfoRepository.deleteBySuppliesId(id);
    }


}

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java

@@ -6,7 +6,6 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
@@ -33,6 +32,13 @@

    @Autowired
    private EmergencySuppliesInfoService emergencySuppliesInfoService;

    @Autowired
    private EmergencySuppliesInspectInfoService emergencySuppliesInspectInfoService;

    @Autowired
    private EmergencySuppliesMaintainInfoService emergencySuppliesMaintainInfoService;


    @DubboReference(check = false)
    private AccountDepartmentService accountDepartmentService;
@@ -145,6 +151,12 @@
        }else{
            Long SuppliesId = emergencySuppliesInfoDetailDO.getId();
            emergencySuppliesInfoService.deleteEmergencySupplies(SuppliesId);

            // 删除保养记录
            emergencySuppliesMaintainInfoService.deleteBySuppliesId(id);
            // 删除检查记录
            emergencySuppliesInspectInfoService.deleteBySuppliesId(id);

        }
    }
}

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml

@@ -90,4 +90,8 @@
    <update id="deleteEmergencySuppliesInspect">
        update emergency_supplies_inspect set del_flag = 1 where id = #{id}
    </update>

    <update id="deleteBySuppliesId">
        update emergency_supplies_inspect set del_flag = 1 where supplies_id = #{id}
    </update>
</mapper>

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml

@@ -91,4 +91,8 @@
    <update id="deleteEmergencySuppliesMaintain">
        update emergency_supplies_maintain set del_flag = 1 where id = #{id}
    </update>

    <update id="deleteBySuppliesId">
        update emergency_supplies_maintain set del_flag = 1 where supplies_id = #{id}
    </update>
</mapper>

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/ExamineMngDto.java

@@ -68,6 +68,17 @@
        this.beExaminedPersonName = beExaminedPersonName;
    }

    //合格分数
    private String acceptanceNumber;

    public String getAcceptanceNumber() {
        return acceptanceNumber;
    }

    public void setAcceptanceNumber(String acceptanceNumber) {
        this.acceptanceNumber = acceptanceNumber;
    }

    public String getBeExaminedDepartmentName() {
        return beExaminedDepartmentName;
    }

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/CommonService.java

对比新文件
@@ -0,0 +1,21 @@
package com.gkhy.safePlatform.targetDuty.service;

import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;

import java.util.Map;
import java.util.Set;


/**
 * 公共服务接口
 *
 * @author xurui
 * @since 2022-07-20 11:49:22
 */
public interface CommonService {
    String getDepName(Long depId);

    DepInfoRPCRespDTO getDepInfo(Long depId);

    Map<Long,String> getDepName(Set<Long> collectDepIdSet);
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/CommonServiceImpl.java

对比新文件
@@ -0,0 +1,67 @@
package com.gkhy.safePlatform.targetDuty.service.impl;

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.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.Map;
import java.util.Set;

/**
 * 公共服务实现类
 *
 * @author xurui
 * @since 2022-07-20 11:49:22
 */
@Service("commonServiceImpl")
public class CommonServiceImpl implements CommonService {

    @DubboReference(check = false)
    private AccountDepartmentService accountDepartmentService;

    @Override
    public String getDepName(Long depId) {
        return this.getDepInfo(depId).getDepName();
    }

    @Override
    public DepInfoRPCRespDTO getDepInfo(Long depId) {
        // 设置部门名称
        ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(depId);
        if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
            if (rpcResult.getData() != null) {
                DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData();
                return dep;
            }
        }
        return new DepInfoRPCRespDTO();
    }


    @Override
    public Map<Long,String> getDepName(Set<Long> collectDepIdSet) {
        Map<Long, String> depPool = new HashMap<>();
        collectDepIdSet.forEach(depId ->{
            // 设置部门名称
            if (!depPool.containsKey(depId)) {
                try {
                    ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(depId);
                    if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
                        if (rpcResult.getData() != null) {
                            DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData();
                            depPool.put(dep.getDepId(), dep.getDepName());
                        }
                    }
                } catch (Exception e) {
                    System.out.println("exception::"+e);
                }
            }
        });
        return depPool;
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java

@@ -1,15 +1,21 @@
package com.gkhy.safePlatform.targetDuty.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.ExamineTemplate;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.CurrentExamineDto;
import com.gkhy.safePlatform.targetDuty.repository.ExamineItemRepository;
import com.gkhy.safePlatform.targetDuty.repository.ExamineMngRepository;
import com.gkhy.safePlatform.targetDuty.entity.ExamineMng;
import com.gkhy.safePlatform.targetDuty.repository.ExamineTemplateRepository;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.ExamineMngService;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -22,9 +28,12 @@
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;

@@ -41,6 +50,11 @@
    private ExamineMngRepository examineMngRepository;
    @Autowired
    private ExamineItemRepository examineItemRepository;
    @Resource
    private ExamineTemplateRepository examineTemplateRepository;

    @Resource
    private CommonService commonService;
    
    
    @Override
@@ -52,9 +66,21 @@
        page = baseMapper.selectPage(page,
                QueryHelpPlus.getPredicate(ExamineMng.class, pageQuery.getSearchParams()));
        List<ExamineMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), ExamineMngDto.class);
        // TODO:获取考核部门名称

        // TODO:获取被考核部门名称
        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f->{
            collectDepIdSet.add(f.getExamineDepartmentId());
            collectDepIdSet.add(f.getBeExaminedDepartmentId());
        });
        //获取部门名集合
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

        respList.forEach(f->{
            f.setExamineDepartmentName(depNameMap.get(f.getExamineDepartmentId()));
            f.setBeExaminedDepartmentName(depNameMap.get(f.getBeExaminedDepartmentId()));
        });

        return new SearchResultVO<>(
                true,
@@ -102,6 +128,12 @@
            });
        }
        dto.setCurrentExamineDtoList(list);

        //获取合格分数
        ExamineTemplate examineTemplate = examineTemplateRepository.selectOne(new QueryWrapper<ExamineTemplate>().eq("id",examineMng.getExamineTemplateId()));
        if(examineTemplate != null){
            dto.setAcceptanceNumber(examineTemplate.getAcceptanceNumber());
        }
        return dto;
    }
}

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java

@@ -14,6 +14,7 @@
import com.gkhy.safePlatform.targetDuty.repository.ExamineItemRepository;
import com.gkhy.safePlatform.targetDuty.repository.ExamineTemplateRepository;
import com.gkhy.safePlatform.targetDuty.entity.ExamineTemplate;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.ExamineItemService;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
import org.springframework.stereotype.Service;
@@ -28,11 +29,10 @@
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -53,6 +53,9 @@
    @Autowired
    private ExamineItemService examineItemService;
    
    @Resource
    private CommonService commonService;
    
    
    @Override
    public ResultVO queryAll(PageQuery<ExamineTemplateQueryCriteria> pageQuery) {
@@ -64,7 +67,18 @@
                QueryHelpPlus.getPredicate(ExamineTemplate.class, pageQuery.getSearchParams()));
        List<ExamineTemplateDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), ExamineTemplateDto.class);

        // TODO:获取设定人部门名称
        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f->{
            collectDepIdSet.add(f.getSetPersonDepartmentId());
        });
        //获取部门名集合
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

        respList.forEach(f->{
            f.setSetPersonDepartmentName(depNameMap.get(f.getSetPersonDepartmentId()));
        });


        return new SearchResultVO<>(

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDutySummaryServiceImpl.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.targetDuty.repository.TargetDutySummaryRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetDutySummary;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDutySummaryService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,11 @@
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;

import javax.annotation.Resource;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
 * (TargetDutySummary)表服务实现类
@@ -31,6 +36,8 @@
    @Autowired
    private TargetDutySummaryRepository targetDutySummaryRepository;
    
    @Resource
    private CommonService commonService;
    
    
    @Override
@@ -43,7 +50,18 @@
                QueryHelpPlus.getPredicate(TargetDutySummary.class, pageQuery.getSearchParams()));
        List<TargetDutySummaryDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetDutySummaryDto.class);

        // TODO:获取责任部门名称
        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f->{
            collectDepIdSet.add(f.getDepartmentId());
        });
        //获取部门名集合
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

        respList.forEach(f->{
            f.setDepartmentName(depNameMap.get(f.getDepartmentId()));
        });

        return new SearchResultVO<>(
                true,

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java

@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDivideDetailQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDivideDetailDto;
import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -23,7 +27,7 @@

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
import java.util.*;

/**
 * 目标指标(TargetMng)表服务实现类
@@ -40,7 +44,8 @@
    @Resource
    private TargetDivideDetailService targetDivideDetailService;
    
    
    @Resource
    private CommonService commonService;
    
    @Override
    public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
@@ -81,9 +86,25 @@
        criteria.setTargetId(targetMng.getId());
        List<TargetDivideDetailDto> respList = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);

        //循环获取部门信息 TODO
        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f->{
            collectDepIdSet.add(f.getDutyDepartmentId());
            collectDepIdSet.add(f.getMakerDepartmentId());
        });
        //获取部门名集合
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

        respList.forEach(f->{
            f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
            f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
        });


        targetMngDto.setTargetDivideDetailList(respList);
        return targetMngDto;
    }


}