zrj
2024-11-09 73c503bca7619e26c2692c20c4ed01cc8f05451b
新增企业详情查询,园区统计新增应急池容量统计
12 files modified
111 ■■■■■ changed files
src/main/java/org/springblade/modules/yw/controller/FirmInfoController.java 12 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/mapper/FirmInfoMapper.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/mapper/FirmInfoMapper.xml 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/service/IEmergencySpaceService.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/service/IFirmInfoService.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java 18 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/service/impl/IndParkInfoServiceImpl.java 15 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/vo/FirmInfoVO.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/vo/IndParkInfoVO.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/yw/controller/FirmInfoController.java
@@ -122,4 +122,16 @@
        return R.data(200, data, data);
    }
    /**
     * 自定义详情查询
     * @param firmInfo
     * @return
     */
    @GetMapping("/getDetail")
    @ApiOperationSupport(order = 9)
    @ApiOperation(value = "详情", notes = "传入firmInfo")
    public R getDetail(FirmInfoVO firmInfo) {
        FirmInfoVO detail = firmInfoService.getDetail(firmInfo);
        return R.data(detail);
    }
}
src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.java
@@ -31,4 +31,10 @@
     * @return
     */
    List<Map<String, Object>> getStatisticData(@Param("emergencySpace") EmergencySpaceVO emergencySpace);
    /**
     * 获取应急池容量
     * @return
     */
    String getEmePool();
}
src/main/java/org/springblade/modules/yw/mapper/EmergencySpaceMapper.xml
@@ -43,4 +43,13 @@
            GROUP BY type
    </select>
    <!--获取应急池容量-->
    <select id="getEmePool" resultType="java.lang.String">
        SELECT
            sum( capacity ) AS num
        FROM
            yw_emergency_space
        WHERE type = 1  AND is_deleted = 0
    </select>
</mapper>
src/main/java/org/springblade/modules/yw/mapper/FirmInfoMapper.java
@@ -25,4 +25,10 @@
     */
    List<FirmInfoVO> selectFirmInfoPage(IPage page,@Param("firmInfo") FirmInfoVO firmInfo);
    /**
     * 自定义详情查询
     * @param firmInfo
     * @return
     */
    FirmInfoVO getDetail(@Param("firmInfo") FirmInfoVO firmInfo);
}
src/main/java/org/springblade/modules/yw/mapper/FirmInfoMapper.xml
@@ -13,4 +13,15 @@
        </if>
    </select>
    <!--自定义详情查询-->
    <select id="getDetail" resultType="org.springblade.modules.yw.vo.FirmInfoVO">
        select
        yfi.*,
        yrt.per_in_cha as rescuePerName,yrt.per_in_cha_pho as rescuePerPhone
         from yw_firm_info yfi
        left join yw_rescue_team yrt on yrt.firm_id = yfi.id and yrt.is_deleted = 0
        where yfi.is_deleted = 0
        and yfi.id = #{firmInfo.id}
    </select>
</mapper>
src/main/java/org/springblade/modules/yw/service/IEmergencySpaceService.java
@@ -39,4 +39,10 @@
     * @return
     */
    List<Map<String,Object>> getStatisticData(EmergencySpaceVO emergencySpace);
    /**
     * 获取应急池容量
     * @return
     */
    String getEmePool();
}
src/main/java/org/springblade/modules/yw/service/IFirmInfoService.java
@@ -31,4 +31,11 @@
     * @param isCovered
     */
    String importFirmInfo(List<FirmInfoExcel> data, Boolean isCovered);
    /**
     * 自定义详情查询
     * @param firmInfo
     * @return
     */
    FirmInfoVO getDetail(FirmInfoVO firmInfo);
}
src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java
@@ -131,4 +131,13 @@
        List<Map<String,Object>> list = baseMapper.getStatisticData(emergencySpace);
        return list;
    }
    /**
     * 获取应急池容量
     * @return
     */
    @Override
    public String getEmePool() {
        return baseMapper.getEmePool();
    }
}
src/main/java/org/springblade/modules/yw/service/impl/FirmInfoServiceImpl.java
@@ -121,4 +121,22 @@
        // 返回
        return getOne(wrapper);
    }
    /**
     * 自定义详情查询
     * @param firmInfo
     * @return
     */
    @Override
    public FirmInfoVO getDetail(FirmInfoVO firmInfo) {
        FirmInfoVO detail = baseMapper.getDetail(firmInfo);
        // 设置类型解析
        if (!Strings.isBlank(detail.getCategory())){
            detail.setCategoryName(
                DictBizCache.getValues("industry_category",detail.getCategory())
            );
        }
        // 返回
        return detail;
    }
}
src/main/java/org/springblade/modules/yw/service/impl/IndParkInfoServiceImpl.java
@@ -6,6 +6,7 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.yw.entity.EmergencySpaceEntity;
import org.springblade.modules.yw.entity.IndParkInfoEntity;
import org.springblade.modules.yw.entity.RescueTeamEntity;
import org.springblade.modules.yw.excel.IndParkInfoExcel;
@@ -140,6 +141,8 @@
        setRegionInfo(indParkInfoVO);
        // 设置救援人员数量
        indParkInfoVO.setRecNum(getRecNum());
        // 设置应急池容量
        indParkInfoVO.setEmePool(getEmePool());
        // 设置风险企业数量
        indParkInfoVO.setRiskFirmNum(getRiskFirmNum());
        // 设置保护目标数量
@@ -151,11 +154,21 @@
    }
    /**
     * 获取应急池容量
     * @return
     */
    private String getEmePool() {
        return emergencySpaceService.getEmePool();
    }
    /**
     * 查询应急空间数量
     * @return
     */
    private Integer getSpaceNum() {
        return (int)emergencySpaceService.count();
        QueryWrapper<EmergencySpaceEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("is_deleted",0);
        return (int)emergencySpaceService.count(wrapper);
    }
    /**
src/main/java/org/springblade/modules/yw/vo/FirmInfoVO.java
@@ -9,4 +9,10 @@
    @ApiModelProperty(value = "行业名称")
    private String categoryName;
    @ApiModelProperty(value = "救援队伍人员姓名")
    private String rescuePerName;
    @ApiModelProperty(value = "救援队伍人员电话")
    private String rescuePerPhone;
}
src/main/java/org/springblade/modules/yw/vo/IndParkInfoVO.java
@@ -57,4 +57,10 @@
     */
    @ApiModelProperty(value = "应急空间数量", example = "")
    private Integer spaceNum;
    /**
     * 应急池容量
     */
    @ApiModelProperty(value = "应急池容量", example = "")
    private String emePool;
}