三道防线查询及应急空间导入调整

zhongrj

2024-11-26 4a59a2d8a8951981ad8d3fb624b6fbae90225783

三道防线查询及应急空间导入调整

 src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java

@@ -30,6 +30,11 @@
    private String firmName;

    @ColumnWidth(20)
    @ExcelProperty(value = "类型",converter = ExcelDictConverter.class)
    @ExcelDictItemLabel(type = "emergency_space_type")
    private String type;

    @ColumnWidth(20)
    @ExcelProperty(value = "防控级别",converter = ExcelDictConverter.class)
    @ExcelDictItemLabel(type = "pre_level")
    private String preLevel;

 src/main/java/org/springblade/modules/yw/mapper/FacilityMapper.xml

@@ -49,7 +49,12 @@
        from yw_emergency_space yes
        left join yw_firm_info yfi on yfi.id = yes.firm_id and yfi.is_deleted = 0
        where yes.is_deleted = 0
        and yes.type = 1
        <if test="facility.facLevel==2">
            and yes.type in (2,10)
        </if>
        <if test="facility.facLevel==3">
            and yes.type = 1
        </if>
        <if test="facility.firmId!=null">
            and yes.firm_id = #{facility.firmId}
        </if>

 src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java

@@ -60,17 +60,21 @@
        for (EmergencySpaceExcel emergencySpaceExcel : data) {
            // 数据拷贝
            EmergencySpaceEntity emergencySpaceEntity = Objects.requireNonNull(BeanUtil.copy(emergencySpaceExcel, EmergencySpaceEntity.class));
            // 防控转换
            // 类型转换
            if (!Strings.isBlank(emergencySpaceExcel.getType())){
                emergencySpaceEntity.setType(Integer.parseInt(emergencySpaceExcel.getType()));
            }
            // 防控级别转换
            if (!Strings.isBlank(emergencySpaceExcel.getPreLevel())){
                emergencySpaceEntity.setPreLevel(Integer.parseInt(emergencySpaceExcel.getPreLevel()));
            }
            // 经纬度转换
            if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
                emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
            }
            if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
                emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
            }
//            if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
//                emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
//            }
//            if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
//                emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
//            }
            // 设置企业id
            setFirm(emergencySpaceExcel,emergencySpaceEntity);
            // 是否已入库
@@ -98,6 +102,9 @@
        QueryWrapper<EmergencySpaceEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("name",emergencySpaceEntity.getName())
            .eq("is_deleted",0);
        if (null!=emergencySpaceEntity.getFirmId()){
            wrapper.eq("firm_id",emergencySpaceEntity.getFirmId());
        }
        EmergencySpaceEntity one = getOne(wrapper);
        if (null!=one){
            return one.getId();

 src/main/java/org/springblade/modules/yw/service/impl/FacilityServiceImpl.java

@@ -116,10 +116,15 @@
            facility.setFacLevel(1);
        }
        // 三道防线信息查询
        if (facility.getFacLevel()==1 || facility.getFacLevel()==2){
        if (facility.getFacLevel()==1 ){
            // 查询并返回
            return baseMapper.getFacilityList(facility);
        }
        // 二道防线查询排口，阀门
        if (facility.getFacLevel()==2){
            // 查询并返回
            return baseMapper.getTreeFacilityList(facility);
        }
        // 第三道防线查询应急空间表的应急池和雨水池信息
        if (facility.getFacLevel()==3){
            return baseMapper.getTreeFacilityList(facility);