火灾模块

mhfire-mapping/pom.xml

@@ -16,6 +16,7 @@
 
     <dependencies>
 
+
         <dependency>
             <groupId>com.bizmatics</groupId>
             <artifactId>mhfire-model</artifactId>

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/FireStatisticsMapper.java

@@ -0,0 +1,52 @@
+package com.bizmatics.mhfire.persistence.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yq
+ * @date 2021/5/28 9:16
+ * 火灾统计模块
+ */
+@Repository
+public interface FireStatisticsMapper {
+
+
+    /**
+     * 根据时间，地址统计火灾数量
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    Integer selectCount(@Param("startTime") String startTime,
+                        @Param("endTime") String endTime,
+                        @Param("fireAddress") String fireAddress,
+                        @Param("level") String level);
+
+
+
+    /**
+     * 分页查询
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    Page<Map<String,Object>> page(IPage<Map<String,Object>> page,
+                                  @Param("startTime") String startTime,
+                                  @Param("endTime")String endTime,
+                                  @Param("endTime")String address);
+
+
+    Map<String,Object> getOne(@Param("id") String id);
+
+
+    List<String> groupByCause();
+
+
+}

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/UnitMapper.java

@@ -1,12 +1,11 @@
 package com.bizmatics.mhfire.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.PageList;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
+
+import com.bizmatics.mhfire.persistence.mapper.po.UnitPO;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,7 +17,7 @@ public interface UnitMapper {
 
 
 
-    Map<String,Object> selectOne(@Param("id") String id);
+    Map<String,Object> selectOne(UnitPO unitPo);
 
 
     Page<Map<String,Object>> page(IPage<Map<String,Object>> page);

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/FirePolicePO.java

@@ -0,0 +1,49 @@
+package com.bizmatics.mhfire.persistence.mapper.po;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/28 13:10
+ * 火灾出警记录
+ */
+@Data
+public class FirePolicePO {
+
+    /**
+     * 处境类型
+     */
+    private String type;
+
+    /**
+     * 出动消防车
+     */
+    private String fireCar;
+
+    /**
+     * 出动消防员
+     */
+    private String fireFiremen;
+
+    /**
+     * 抢救被困人员
+     */
+    private String salvageTrapPerson;
+
+    /**
+     * 疏散人员
+     */
+    private String evacuatePerson;
+
+    /**
+     * 抢救财产
+     */
+    private String salvageMoney;
+
+
+
+
+
+
+
+}

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/FireStatisticsPO.java

@@ -0,0 +1,55 @@
+package com.bizmatics.mhfire.persistence.mapper.po;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/28 9:49
+ * 火灾统计
+ */
+@Data
+public class FireStatisticsPO {
+
+    /**
+     * id
+     */
+    private String id;
+
+
+    /**
+     * 火灾地址
+     */
+    private String address;
+
+    /**
+     * 过火面积
+     */
+    private String burnedArea;
+
+    /**
+     * 财产损失
+     */
+    private String propertyLoss;
+
+
+    /**
+     * 死亡人数
+     */
+    private String deathToll;
+
+    /**
+     * 受伤人数
+     */
+    private String nonFatal;
+
+    /**
+     * 受灾户数
+     */
+    private String disasterHome;
+
+    /**
+     * 受灾原因
+     */
+    private String fireCause;
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/po/FireWaterPO.java → mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/FireWaterPO.java

@@ -1,4 +1,4 @@
-package com.bizmatics.mhfire.service.po;
+package com.bizmatics.mhfire.persistence.mapper.po;
 
 import lombok.Data;
 

mhfire-service/src/main/java/com/bizmatics/mhfire/service/po/UnitBeOnDutyPO.java → mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/UnitBeOnDutyPO.java

@@ -1,9 +1,7 @@
-package com.bizmatics.mhfire.service.po;
+package com.bizmatics.mhfire.persistence.mapper.po;
 
 import lombok.Data;
 
-import javax.print.DocFlavor;
-
 /**
  * @author yq
  * @date 2021/5/27 15:19

mhfire-service/src/main/java/com/bizmatics/mhfire/service/po/UnitPO.java → mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/po/UnitPO.java

@@ -1,4 +1,4 @@
-package com.bizmatics.mhfire.service.po;
+package com.bizmatics.mhfire.persistence.mapper.po;
 
 import lombok.Data;
 

mhfire-mapping/src/main/resources/mapper/mysql/FireStatisticsMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.mhfire.persistence.mapper.FireStatisticsMapper">
+
+    <select id="selectCount" resultType="java.lang.Integer">
+        select count(1)
+        from hzdc-hztjb as fire
+        <where>
+            <if test="startTime != null and startTime !=''">
+                and fire.起火时间_日期型 >= #{startTime}
+            </if>
+            <if test="endTime !=null and endTime !=''">
+                and fire.起火时间_日期型 &lt;= #{endTime}
+            </if>
+            <if test="fireAddress !=null and fireAddress !=''">
+                and fire.起火地点 LIKE CONCAT(CONCAT('%', #{fireAddress}), '%')
+            </if>
+            <if test="level !=null and level !=''">
+                and fire.火灾原因分类（一级）= #{level}
+            </if>
+        </where>
+    </select>
+    <select id="page" resultType="java.util.Map">
+        select *
+        from hzdc-hztjb as fire
+        <where>
+            <if test="startTime != null and startTime !=''">
+                and fire.起火时间_日期型 >= #{startTime}
+            </if>
+            <if test="endTime !=null and endTime !=''">
+                and fire.起火时间_日期型 &lt;= #{endTime}
+            </if>
+            <if test="fireAddress !=null and fireAddress !=''">
+                and fire.起火地点 LIKE CONCAT(CONCAT('%', #{fireAddress}), '%')
+            </if>
+        </where>
+    </select>
+    <select id="getOne" resultType="java.util.Map">
+        select * from hzdc-hztjb where 火灾序号 = #{id};
+    </select>
+    <select id="groupByCause" resultType="java.lang.String">
+        select * from hzdc-hztjb group by 火灾原因分类（一级）
+    </select>
+</mapper>

mhfire-mapping/src/main/resources/mapper/mysql/UnitMapper.xml

@@ -3,7 +3,19 @@
 <mapper namespace="com.bizmatics.mhfire.persistence.mapper.UnitMapper">
 
     <select id="selectOne" resultType="java.util.Map">
-        select * from jbzb-dwxx-all where ID = #{id}
+        select *
+        from jbzb-dwxx-all
+        <where>
+            <if test="unitPo.id != null and unitPo.id !=''">
+                and ID = #{unitPo.id}
+            </if>
+            <if test="unitPo.name !=null and unitPo.name !=''">
+                and 单位名称 = #{unitPo.name}
+            </if>
+            <if test="unitPo.address !=null and unitPo.address !=''">
+                and 单位地址 = #{unitPo.address}
+            </if>
+        </where>
     </select>
     <select id="page" resultType="java.util.Map">
         select * from jbzb-dwxx-all

mhfire-service/src/main/java/com/bizmatics/mhfire/service/FireStatisticsService.java

@@ -0,0 +1,64 @@
+package com.bizmatics.mhfire.service;
+
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
+import com.bizmatics.mhfire.service.vo.FireLevelRatioVO;
+import com.bizmatics.mhfire.service.vo.FireUnitPoliceVO;
+
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/5/28 9:32
+ * 火灾统计
+ */
+public interface FireStatisticsService {
+
+
+    /**
+     * 根据年份和地址查看12月份的火灾统计
+     * @param year
+     * @param address
+     * @return
+     */
+    List<Integer> getFireCountByData(Integer year,String address);
+
+
+    /**
+     * 分页
+     * @param current
+     * @param size
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    CommonPage<FireStatisticsPO> page(Integer current, Integer size, String startTime, String endTime, String address);
+
+
+    /**
+     * getOne
+     * @param id
+     * @return
+     */
+    FireStatisticsPO getOne(String id);
+
+
+    /**
+     * 火灾-单位-出警信息
+     * @param id
+     * @return
+     */
+    FireUnitPoliceVO getFireUnitPolice(String id);
+
+
+    /**
+     * 火灾原因占比
+     * @param startTime
+     * @param endTime
+     * @param address
+     * @return
+     */
+    List<FireLevelRatioVO> getGroupByLevel(String startTime,String endTime,String address);
+
+
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/FireWaterService.java

@@ -1,7 +1,8 @@
 package com.bizmatics.mhfire.service;
 
+
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.mhfire.service.po.FireWaterPO;
+import com.bizmatics.mhfire.persistence.mapper.po.FireWaterPO;
 import com.bizmatics.mhfire.service.vo.FireWaterStatisticsVO;
 
 /**
@@ -28,7 +29,7 @@ public interface FireWaterService {
      * @param endTime
      * @return
      */
-    CommonPage<FireWaterPO> page(Integer current,Integer size,String startTime,String endTime);
+    CommonPage<FireWaterPO> page(Integer current, Integer size, String startTime, String endTime);
 
 
     /**

mhfire-service/src/main/java/com/bizmatics/mhfire/service/UnitBeOnDutyService.java

@@ -1,6 +1,6 @@
 package com.bizmatics.mhfire.service;
 
-import com.bizmatics.mhfire.service.po.UnitBeOnDutyPO;
+import com.bizmatics.mhfire.persistence.mapper.po.UnitBeOnDutyPO;
 
 /**
  * @author yq

mhfire-service/src/main/java/com/bizmatics/mhfire/service/UnitService.java

@@ -1,11 +1,9 @@
 package com.bizmatics.mhfire.service;
 
 import com.bizmatics.common.core.bean.CommonPage;
-import com.bizmatics.mhfire.service.po.UnitPO;
+import com.bizmatics.mhfire.persistence.mapper.po.UnitPO;
 import com.bizmatics.mhfire.service.vo.UnitAlCheckVO;
 
-import java.util.List;
-
 /**
  * @author yq
  * @date 2021/5/25 17:25
@@ -18,7 +16,7 @@ public interface UnitService {
      * 获取单个单位信息
      * @return
      */
-    UnitPO getOne(String id);
+    UnitPO getOne(UnitPO unitPo);
 
     /**
      * 分页

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireStatisticsServiceImpl.java

@@ -0,0 +1,105 @@
+package com.bizmatics.mhfire.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.common.core.util.DateUtils;
+import com.bizmatics.mhfire.persistence.mapper.FireStatisticsMapper;
+
+import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
+import com.bizmatics.mhfire.persistence.mapper.po.UnitPO;
+import com.bizmatics.mhfire.service.FireStatisticsService;
+import com.bizmatics.mhfire.service.UnitService;
+
+import com.bizmatics.mhfire.service.vo.FireLevelRatioVO;
+import com.bizmatics.mhfire.service.vo.FireUnitPoliceVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @author yq
+ * @date 2021/5/28 9:35
+ */
+@Service
+public class FireStatisticsServiceImpl implements FireStatisticsService {
+
+    @Autowired
+    private FireStatisticsMapper fireStatisticsMapper;
+    @Autowired
+    private UnitService unitService;
+    @Override
+    public List<Integer> getFireCountByData(Integer year, String address) {
+        List<Integer> list = new ArrayList<>();
+        Date date = new Date();
+        for (int i = 0; i < 12; i++) {
+            DateUtils.setMonths(date,i);
+            Date firstDayOfMonth = DateUtils.getFirstDayOfMonth(date);
+            Date lastDayOfMonth = DateUtils.getLastDayOfMonth(date);
+            list.add(fireStatisticsMapper.selectCount(DateUtils.format(firstDayOfMonth), DateUtils.format(lastDayOfMonth), address,null));
+        }
+        return list;
+    }
+
+
+    @Override
+    public CommonPage<FireStatisticsPO> page(Integer current, Integer size, String startTime, String endTime, String address) {
+        Page<Map<String, Object>> page = new Page<>(current, size);
+        page = fireStatisticsMapper.page(page, startTime, endTime, address);
+        List<FireStatisticsPO> list = new ArrayList<>();
+        page.getRecords().forEach(stringObjectMap -> list.add(enhanceFireStatisticsPo(stringObjectMap)));
+        return new CommonPage<>(list, page.getTotal(), page.getSize(), page.getCurrent());
+    }
+
+    @Override
+    public FireStatisticsPO getOne(String id) {
+        return enhanceFireStatisticsPo(fireStatisticsMapper.getOne(id));
+    }
+
+    @Override
+    public FireUnitPoliceVO getFireUnitPolice(String id) {
+        //火灾详细信息
+        FireStatisticsPO fireStatisticsPo = getOne(id);
+        //单位信息
+        UnitPO unitPo = new UnitPO();
+        unitPo.setAddress(fireStatisticsPo.getAddress());
+        unitPo = unitService.getOne(unitPo);
+
+        //TODO 出警记录没有
+        FireUnitPoliceVO fireUnitPoliceVO = new FireUnitPoliceVO();
+        fireUnitPoliceVO.setFireStatisticsPo(fireStatisticsPo);
+        fireUnitPoliceVO.setUnitPo(unitPo);
+        return fireUnitPoliceVO;
+    }
+
+    @Override
+    public List<FireLevelRatioVO> getGroupByLevel(String startTime, String endTime, String address) {
+        List<FireLevelRatioVO> list = new ArrayList<>();
+        int fireCount = 0;
+        List<String> fireCauses = fireStatisticsMapper.groupByCause();
+        for (String cause:fireCauses) {
+            FireLevelRatioVO fireLevelRatioVo = new FireLevelRatioVO();
+            fireLevelRatioVo.setFireType(cause);
+            Integer radio = fireStatisticsMapper.selectCount(startTime, endTime, address, cause);
+            fireLevelRatioVo.setRadio(radio.doubleValue());
+            list.add(fireLevelRatioVo);
+            fireCount+=radio;
+        }
+        int finalFireCount = fireCount;
+        list.forEach(fireLevelRatioVO -> fireLevelRatioVO.setRadio(fireLevelRatioVO.getRadio()/ finalFireCount));
+        return null;
+    }
+
+    public FireStatisticsPO enhanceFireStatisticsPo(Map<String,Object> map){
+        FireStatisticsPO fireStatisticsPo = new FireStatisticsPO();
+        fireStatisticsPo.setId(map.get("火灾序号").toString());
+        fireStatisticsPo.setAddress(map.get("起火地点").toString());
+        fireStatisticsPo.setBurnedArea(map.get("过火面积").toString());
+        fireStatisticsPo.setPropertyLoss(map.get("直接财产损失").toString());
+        fireStatisticsPo.setDeathToll(map.get("死亡人数").toString());
+        fireStatisticsPo.setNonFatal(map.get("受灾人数").toString());
+        fireStatisticsPo.setDisasterHome(map.get("受灾户数").toString());
+        fireStatisticsPo.setFireCause(map.get("火灾原因分类（一级）").toString());
+        return fireStatisticsPo;
+    }
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/FireWaterServiceImpl.java

@@ -3,9 +3,9 @@ package com.bizmatics.mhfire.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.mhfire.persistence.mapper.FireWaterMapper;
+import com.bizmatics.mhfire.persistence.mapper.po.FireWaterPO;
 import com.bizmatics.mhfire.service.FireWaterService;
-import com.bizmatics.mhfire.service.po.FireWaterPO;
-import com.bizmatics.mhfire.service.po.UnitPO;
+
 import com.bizmatics.mhfire.service.vo.FireWaterStatisticsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -67,20 +67,20 @@ public class FireWaterServiceImpl implements FireWaterService {
      * @return
      */
     public FireWaterPO enhanceFireWaterPo(Map<String,Object> fireWaterMap){
-        FireWaterPO fireWaterPO = new FireWaterPO();
-        fireWaterPO.setAddress(fireWaterMap.get("水源地址").toString());
+        FireWaterPO fireWaterPo = new FireWaterPO();
+        fireWaterPo.setAddress(fireWaterMap.get("水源地址").toString());
         //TODO 责任人字段没有
-        fireWaterPO.setDutyPerson(fireWaterMap.get("责任人").toString());
+        fireWaterPo.setDutyPerson(fireWaterMap.get("责任人").toString());
         //TODO 手机号字段没有
-        fireWaterPO.setPhone(fireWaterMap.get("手机号").toString());
-        fireWaterPO.setType(fireWaterMap.get("水源类型").toString());
-        fireWaterPO.setJurisdictionalAgency(fireWaterMap.get("管辖机构名称").toString());
-        fireWaterPO.setGetWaterType(fireWaterMap.get("取水形式").toString());
+        fireWaterPo.setPhone(fireWaterMap.get("手机号").toString());
+        fireWaterPo.setType(fireWaterMap.get("水源类型").toString());
+        fireWaterPo.setJurisdictionalAgency(fireWaterMap.get("管辖机构名称").toString());
+        fireWaterPo.setGetWaterType(fireWaterMap.get("取水形式").toString());
         //TODO 水源行政字段没有
-        fireWaterPO.setWaterAdministrative(fireWaterMap.get("手机号").toString());
-        fireWaterPO.setStatus(fireWaterMap.get("可用状态").toString());
-        fireWaterPO.setWaterUnit(fireWaterMap.get("供水单位").toString());
-        fireWaterPO.setWaterGage(fireWaterMap.get("管网压力").toString());
-        return fireWaterPO;
+        fireWaterPo.setWaterAdministrative(fireWaterMap.get("手机号").toString());
+        fireWaterPo.setStatus(fireWaterMap.get("可用状态").toString());
+        fireWaterPo.setWaterUnit(fireWaterMap.get("供水单位").toString());
+        fireWaterPo.setWaterGage(fireWaterMap.get("管网压力").toString());
+        return fireWaterPo;
     }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/SiAeAllServiceImpl.java

@@ -22,15 +22,15 @@ public class SiAeAllServiceImpl implements SiAeAllService {
     private SiAeAllMapper siAeAllMapper;
     @Override
     public List<SiAeAllVO> getAeAllCollect(SiAeAllRequest siAeAllRequest) {
-        List<SiAeAllVO> allVOS = new ArrayList<>();
+        List<SiAeAllVO> allVoS = new ArrayList<>();
         Map<String, Integer> aeAllCollect = siAeAllMapper.selectAeAllCollect(siAeAllRequest);
         //TODO 获取同比和环比时间
         for (String type:aeAllCollect.keySet()) {
             SiAeAllVO siAeAllVO = new SiAeAllVO();
             siAeAllVO.setCheckType(type);
             siAeAllVO.setNumber(aeAllCollect.get(type));
-            allVOS.add(siAeAllVO);
+            allVoS.add(siAeAllVO);
         }
-        return allVOS;
+        return allVoS;
     }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/UnitBeOnDutyServiceImpl.java

@@ -2,7 +2,7 @@ package com.bizmatics.mhfire.service.impl;
 
 import com.bizmatics.mhfire.persistence.mapper.UnitBeOnDutyMapper;
 import com.bizmatics.mhfire.service.UnitBeOnDutyService;
-import com.bizmatics.mhfire.service.po.UnitBeOnDutyPO;
+import com.bizmatics.mhfire.persistence.mapper.po.UnitBeOnDutyPO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,9 +24,9 @@ public class UnitBeOnDutyServiceImpl implements UnitBeOnDutyService {
 
 
     public UnitBeOnDutyPO enhanceUnitBeOnDutyPo(Map<String,Object> unitBeOnDutyMap){
-        UnitBeOnDutyPO unitBeOnDutyPO = new UnitBeOnDutyPO();
-        unitBeOnDutyPO.setLead(unitBeOnDutyMap.get("值班人员姓名").toString());
+        UnitBeOnDutyPO unitBeOnDutyPo = new UnitBeOnDutyPO();
+        unitBeOnDutyPo.setLead(unitBeOnDutyMap.get("值班人员姓名").toString());
         //TODO 值班信息全部没有
-        return unitBeOnDutyPO;
+        return unitBeOnDutyPo;
     }
 }

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/UnitServiceImpl.java

@@ -1,12 +1,12 @@
 package com.bizmatics.mhfire.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.mhfire.persistence.mapper.UnitMapper;
+import com.bizmatics.mhfire.persistence.mapper.po.UnitPO;
 import com.bizmatics.mhfire.service.UnitService;
-import com.bizmatics.mhfire.service.po.UnitPO;
+
 import com.bizmatics.mhfire.service.vo.UnitAlCheckVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,8 +25,8 @@ public class UnitServiceImpl implements UnitService {
     @Autowired
     private UnitMapper unitMapper;
     @Override
-    public UnitPO getOne(String id) {
-        Map<String, Object> map = unitMapper.selectOne(id);
+    public UnitPO getOne(UnitPO unitPo) {
+        Map<String, Object> map = unitMapper.selectOne(unitPo);
         return enhanceUnitPo(map);
     }
 
@@ -34,18 +34,20 @@ public class UnitServiceImpl implements UnitService {
     public CommonPage<UnitPO> page(Integer current, Integer size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         page = unitMapper.page(page);
-        List<UnitPO> unitPOList = new ArrayList<>();
-        page.getRecords().forEach(stringObjectMap -> unitPOList.add(enhanceUnitPo(stringObjectMap)));
-        return new CommonPage<>(unitPOList, page.getTotal(), page.getSize(), page.getCurrent());
+        List<UnitPO> unitPoList = new ArrayList<>();
+        page.getRecords().forEach(stringObjectMap -> unitPoList.add(enhanceUnitPo(stringObjectMap)));
+        return new CommonPage<>(unitPoList, page.getTotal(), page.getSize(), page.getCurrent());
 
     }
 
     @Override
     public UnitAlCheckVO getUnitAlCheck(String unitId, String startTime, String endTime) {
-        UnitAlCheckVO unitAlCheckVO = BeanMapperUtils.map(getOne(unitId), UnitAlCheckVO.class);
+        UnitPO unitPo = new UnitPO();
+        unitPo.setId(unitId);
+        UnitAlCheckVO unitAlCheckVo = BeanMapperUtils.map(getOne(unitPo), UnitAlCheckVO.class);
         //TODO 行政检查记录,历史处罚情况没有找见对应的记录
 
-        return unitAlCheckVO;
+        return unitAlCheckVo;
     }
 
     /**

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireLevelRatioVO.java

@@ -0,0 +1,23 @@
+package com.bizmatics.mhfire.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/28 14:03
+ * 火灾原因占比
+ */
+@Data
+public class FireLevelRatioVO {
+
+    /**
+     * 火灾类别
+     */
+    private String fireType;
+
+
+    /**
+     * 比例
+     */
+    private Double radio;
+}

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/FireUnitPoliceVO.java

@@ -0,0 +1,30 @@
+package com.bizmatics.mhfire.service.vo;
+
+import com.bizmatics.mhfire.persistence.mapper.po.FirePolicePO;
+import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
+import com.bizmatics.mhfire.persistence.mapper.po.UnitPO;
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/5/28 13:07
+ * 火灾-单位-出警信息
+ */
+@Data
+public class FireUnitPoliceVO {
+
+    /**
+     * 单位信息
+     */
+    private UnitPO unitPo;
+
+    /**
+     * 火灾基本信息
+     */
+    private FireStatisticsPO fireStatisticsPo;
+
+    /**
+     * 出警情况
+     */
+    private FirePolicePO firePolicePo;
+}