Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/controller/PostDisasterAssessController.java

@@ -0,0 +1,25 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.controller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireVO;
+import com.sooka.sponest.event.eventPostDisasterAssess.service.PostDisasterAssessService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/postDisasterAssess")
+public class PostDisasterAssessController extends BaseController {
+
+    @Resource
+    private PostDisasterAssessService postDisasterAssessService;
+
+    @PostMapping("/insertFireAssess")
+    public AjaxResult insertFireAssess(@RequestBody FireVO fireVO){
+        return postDisasterAssessService.insertFireAssess(fireVO);
+    }
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/domain/FireAssess.java

@@ -0,0 +1,251 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.apache.ibatis.type.Alias;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Alias("fireAssess")
+public class FireAssess {
+    /**
+     *  主键id
+     */
+    private String id;
+    /**
+     *  事件id
+     */
+    private String eventId;
+    /**
+     *  起火时间
+     */
+    private String fireTime;
+    /**
+     *  发现时间
+     */
+    private String foundTime;
+    /**
+     *  扑灭时间
+     */
+    private String blazesTime;
+    /**
+     *  起火城市
+     */
+    private String address;
+    /**
+     *  起火地点
+     */
+    private String firePlace;
+    /**
+     *  发现方式
+     */
+    private String foundType;
+    /**
+     *  东经(度)
+     */
+    private String longitudeD;
+    /**
+     *  东经(分)
+     */
+    private String longitudeM;
+    /**
+     *  东经(秒)
+     */
+    private String longitudeS;
+    /**
+     *  北纬(度)
+     */
+    private String latitudeD;
+    /**
+     *  北纬(分)
+     */
+    private String latitudeM;
+    /**
+     *  北纬(秒)
+     */
+    private String latitudeS;
+    /**
+     *  起火原因
+     */
+    private String fireSource;
+    /**
+     *  火灾种类
+     */
+    private String fireType;
+    /**
+     *  火灾等级
+     */
+    private String fireLevel;
+    /**
+     *  总面积合计
+     */
+    private String areaTotal;
+    /**
+     *  森林面积损失合计
+     */
+    private String forestLossAreaTotal;
+    /**
+     *  原始林面积
+     */
+    private String originalForestArea;
+    /**
+     *  人工林面积
+     */
+    private String artificialForestArea;
+    /**
+     *  出动总人数
+     */
+    private String peopleTotal;
+    /**
+     *  扑火队人数
+     */
+    private String blazesTeamNumber;
+    /**
+     *  森警人数
+     */
+    private String policeNumber;
+    /**
+     *  军队人数
+     */
+    private String armyNumber;
+    /**
+     *  群众人数
+     */
+    private String crowdNumber;
+    /**
+     *  风力灭火机
+     */
+    private String windExtinguisher;
+    /**
+     *  二号工具
+     */
+    private String secondTool;
+    /**
+     *  水枪
+     */
+    private String waterGun;
+    /**
+     *  其他
+     */
+    private String elseThings;
+    /**
+     *  林木组成
+     */
+    private String forestComposition;
+    /**
+     *  林令
+     */
+    private String forestToken;
+    /**
+     *  疏密度
+     */
+    private String porosities;
+    /**
+     *  天气
+     */
+    private String weather;
+    /**
+     *  气温
+     */
+    private String temperature;
+    /**
+     *  火险等级
+     */
+    private String fireInsuranceLevel;
+    /**
+     *  风力等级
+     */
+    private String windLevel;
+    /**
+     *  风向
+     */
+    private String windDirection;
+    /**
+     *  指挥扑火人单位
+     */
+    private String commandUnit;
+    /**
+     *  指挥扑火人姓名
+     */
+    private String commandName;
+    /**
+     *  指挥扑火人职务
+     */
+    private String commandPosition;
+    /**
+     *  调查人单位
+     */
+    private String surveyUnit;
+    /**
+     *  调查人姓名
+     */
+    private String surveyName;
+    /**
+     *  调查人职务
+     */
+    private String surveyPosition;
+    /**
+     *  肇事人姓名
+     */
+    private String accidentName;
+    /**
+     *  肇事人性别
+     */
+    private String accidentSex;
+    /**
+     *  肇事人年龄
+     */
+    private String accidentAge;
+    /**
+     *  肇事人职业
+     */
+    private String accidentPosition;
+    /**
+     *  肇事人单位或住址
+     */
+    private String accidentUnit;
+    /**
+     *  处理方式
+     */
+    private String dealType;
+    /**
+     *  处理人数
+     */
+    private String dealNumber;
+    /**
+     *  刑事处罚人数
+     */
+    private String criminalDealNumber;
+    /**
+     *  肇事人处理情况
+     */
+    private String accidentDealSituation;
+    /**
+     *  责任人追查情况
+     */
+    private String responsibilityDealSituation;
+    /**
+     *  领导责任追查情况
+     */
+    private String leadershipDealSituation;
+    /**
+     *  县填表人
+     */
+    private String townForm;
+    /**
+     *  县审核人
+     */
+    private String townAudit;
+    /**
+     *  市填表人
+     */
+    private String cityForm;
+    /**
+     *  市审核人
+     */
+    private String cityAudit;
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/domain/FireLoss.java

@@ -0,0 +1,159 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.ibatis.type.Alias;
+
+/**
+ * 火灾信息实体类，包含火灾相关的各项信息
+ */
+@Getter
+@Setter
+@Alias("fireLoss")
+public class FireLoss {
+
+    /**
+     * 主键id，用于唯一标识每条记录
+     */
+    private String id;
+
+    /**
+     * 事件id，关联具体的火灾事件
+     */
+    private String eventId;
+
+    /**
+     * 填报单位，负责填报该火灾信息的单位
+     */
+    private String reportUnit;
+
+    /**
+     * 填报时间(年)，记录填报信息时对应的年份
+     */
+    private String reportTimeYear;
+
+    /**
+     * 填报时间(月)，记录填报信息时对应的月份
+     */
+    private String reportTimeMonth;
+
+    /**
+     * 填报时间(日)，记录填报信息时对应的日期
+     */
+    private String reportTimeDay;
+
+    /**
+     * 森林火灾损失总计，森林火灾造成的所有损失总和
+     */
+    private String forestFireLossTotal;
+
+    /**
+     * 火灾损失合计，包括各种类型火灾造成的损失总和
+     */
+    private String fireLossTotal;
+
+    /**
+     * 成林蓄积，森林中达到一定标准的树木蓄积量
+     */
+    private String forestArea;
+
+    /**
+     * 成林价值，成林的经济价值
+     */
+    private String forestPrice;
+
+    /**
+     * 幼树株数，森林中幼树的数量
+     */
+    private String treesNumber;
+
+    /**
+     * 幼树价值，幼树的经济价值
+     */
+    private String treesPrice;
+
+    /**
+     * 轻伤人数，火灾中受轻伤的人员数量
+     */
+    private String minorInjuriesNumber;
+
+    /**
+     * 轻伤费用，治疗轻伤人员产生的费用
+     */
+    private String minorInjuriesPrice;
+
+    /**
+     * 重伤人数，火灾中受重伤的人员数量
+     */
+    private String seriouslyInjuredNumber;
+
+    /**
+     * 重伤费用，治疗重伤人员产生的费用
+     */
+    private String seriouslyInjuredPrice;
+
+    /**
+     * 死亡人数，火灾中死亡的人员数量
+     */
+    private String deathNumber;
+
+    /**
+     * 死亡费用，与火灾死亡相关的费用
+     */
+    private String deathPrice;
+
+    /**
+     * 其他火灾损失，除上述明确列出损失外的其他火灾损失费用
+     */
+    private String otherFireLossPrice;
+
+    /**
+     * 扑火费用合计，扑灭火灾所产生的所有费用总和
+     */
+    private String blazesPriceTotal;
+
+    /**
+     * 人工天数，扑火过程中投入的人工天数
+     */
+    private String artificialDays;
+
+    /**
+     * 人工费用，扑火人工产生的费用
+     */
+    private String artificialPrice;
+
+    /**
+     * 车辆数量，扑火过程中使用的车辆总数
+     */
+    private String vehicleNumber;
+
+    /**
+     * 汽车数量，扑火过程中使用的汽车数量
+     */
+    private String carNumber;
+
+    /**
+     * 车辆费用，使用车辆产生的费用
+     */
+    private String vehiclePrice;
+
+    /**
+     * 飞机数量，扑火过程中使用的飞机数量
+     */
+    private String planeNumber;
+
+    /**
+     * 飞机费用，使用飞机产生的费用
+     */
+    private String planePrice;
+
+    /**
+     * 其他扑火费用，除人工、车辆、飞机费用外的其他扑火费用
+     */
+    private String otherBlazesPrice;
+
+    /**
+     * 备注，关于该火灾事件的其他补充说明信息
+     */
+    private String note;
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/domain/FireVO.java

@@ -0,0 +1,15 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class FireVO {
+    private String eventId;
+    private FireAssess fireAssess;
+    private FireLoss fireLoss;
+    private List<RegionalFlag> regionalFlagList;
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/domain/RegionalFlag.java

@@ -0,0 +1,16 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.ibatis.type.Alias;
+
+@Setter
+@Getter
+@Alias("regionalFlag")
+public class RegionalFlag {
+    private String id;
+    private String eventId;
+    private String longitude;
+    private String latitude;
+    private String sort;
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/mapper/FireAssessMapper.java

@@ -0,0 +1,7 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.mapper;
+
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireAssess;
+
+public interface FireAssessMapper {
+    int insertFireAssess(FireAssess fireAssess);
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/mapper/FireLossMapper.java

@@ -0,0 +1,7 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.mapper;
+
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireLoss;
+
+public interface FireLossMapper {
+    int insertFireLoss(FireLoss fireLoss);
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/mapper/RegionalFlagMapper.java

@@ -0,0 +1,9 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.mapper;
+
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.RegionalFlag;
+
+import java.util.List;
+
+public interface RegionalFlagMapper {
+    void insertRegionalFlagList(List<RegionalFlag> regionalFlagList);
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/service/PostDisasterAssessService.java

@@ -0,0 +1,9 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.service;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireAssess;
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireVO;
+
+public interface PostDisasterAssessService {
+    AjaxResult insertFireAssess(FireVO fireVO);
+}

src/main/java/com/sooka/sponest/event/eventPostDisasterAssess/service/impl/PostDisasterAssessServiceImpl.java

@@ -0,0 +1,88 @@
+package com.sooka.sponest.event.eventPostDisasterAssess.service.impl;
+
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireAssess;
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireLoss;
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.FireVO;
+import com.sooka.sponest.event.eventPostDisasterAssess.domain.RegionalFlag;
+import com.sooka.sponest.event.eventPostDisasterAssess.mapper.FireAssessMapper;
+import com.sooka.sponest.event.eventPostDisasterAssess.mapper.FireLossMapper;
+import com.sooka.sponest.event.eventPostDisasterAssess.mapper.RegionalFlagMapper;
+import com.sooka.sponest.event.eventPostDisasterAssess.service.PostDisasterAssessService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class PostDisasterAssessServiceImpl implements PostDisasterAssessService {
+
+    private static final Logger logger = LoggerFactory.getLogger(PostDisasterAssessServiceImpl.class);
+
+    @Resource
+    private FireAssessMapper fireAssessMapper;
+
+    @Resource
+    private FireLossMapper fireLossMapper;
+
+    @Resource
+    private RegionalFlagMapper regionalFlagMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult insertFireAssess(FireVO fireVO) {
+        // 检查事件 ID 是否为空
+        if (StringUtils.isEmpty(fireVO.getEventId())) {
+            return AjaxResult.error("未绑定事件!");
+        }
+
+        try {
+            // 插入 FireAssess
+            if (fireVO.getFireAssess() != null) {
+                insertFireAssessEntity(fireVO.getFireAssess(), fireVO.getEventId());
+            }
+
+            // 插入 FireLoss
+            if (fireVO.getFireLoss() != null) {
+                insertFireLossEntity(fireVO.getFireLoss(), fireVO.getEventId());
+            }
+
+            // 插入 RegionalFlag 列表
+            if (!fireVO.getRegionalFlagList().isEmpty()) {
+                insertRegionalFlagList(fireVO.getRegionalFlagList(), fireVO.getEventId());
+            }
+
+            return AjaxResult.success();
+        } catch (Exception e) {
+            // 记录异常日志
+            logger.error("灾后评估写入失败！", e);
+            // 抛出异常，让事务管理器处理回滚
+            throw e;
+        }
+    }
+
+    private void insertFireAssessEntity(FireAssess fireAssess, String eventId) {
+        fireAssess.setId(IdUtils.fastSimpleUUID());
+        fireAssess.setEventId(eventId);
+        fireAssessMapper.insertFireAssess(fireAssess);
+    }
+
+    private void insertFireLossEntity(FireLoss fireLoss, String eventId) {
+        fireLoss.setId(IdUtils.fastSimpleUUID());
+        fireLoss.setEventId(eventId);
+        fireLossMapper.insertFireLoss(fireLoss);
+    }
+
+    private void insertRegionalFlagList(List<RegionalFlag> regionalFlagList, String eventId) {
+        regionalFlagList.forEach(flag -> {
+            flag.setId(IdUtils.fastSimpleUUID());
+            flag.setEventId(eventId);
+        });
+        regionalFlagMapper.insertRegionalFlagList(regionalFlagList);
+    }
+}

src/main/java/com/sooka/sponest/event/eventProcess/controller/EventProcessController.java

@@ -25,7 +25,7 @@ import static com.sooka.sponest.event.utils.eventConstants.EventConstants.*;
  * @since 2025/07/03
  */
 @RestController
-@RequestMapping("eventProcess")
+@RequestMapping("/eventProcess")
 public class EventProcessController extends BaseController {
 
     @Resource
@@ -251,4 +251,12 @@ public class EventProcessController extends BaseController {
         return AjaxResult.success("事件日志新增成功");
     }
 
+    /**
+     * 指挥中心-事件类型统计
+     */
+    @GetMapping("/getCountFromMenuIdAndEventType")
+    public AjaxResult getCountFromMenuIdAndEventType(EventInfo eventInfo){
+        return eventProcessService.getCountFromMenuIdAndEventType(eventInfo);
+    }
+
 }

src/main/java/com/sooka/sponest/event/eventProcess/domain/EventInfo.java

@@ -133,11 +133,6 @@ public class EventInfo extends BaseBusinessEntity {
      */
     private List<Long> deptIdList = new ArrayList<>();
 
-    /**
-     * 确认火情事件时, 传递事件类型的key
-     */
-    private String newEventType;
-
     private String deptId;
 
 

src/main/java/com/sooka/sponest/event/eventProcess/mapper/EventProcessMapper.java

@@ -8,6 +8,7 @@ import com.sooka.sponest.event.eventProcess.domain.BO.EventInfoBO;
 import com.sooka.sponest.event.eventProcess.domain.EventInfo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface EventProcessMapper {
 
@@ -42,4 +43,6 @@ public interface EventProcessMapper {
     void deleteEventProcess(EventInfo eventInfo);
 
     List<EventInfoBO> selectProcessAttachFromUnconfirmed();
+
+    List<Map<String, Object>> getCountFromMenuIdAndEventType(EventInfo eventInfo);
 }

src/main/java/com/sooka/sponest/event/eventProcess/service/EventProcessService.java

@@ -76,4 +76,6 @@ public interface EventProcessService {
     List<EventInfoBO> selectProcessAttachFromUnconfirmed();
 
     AjaxResult insertProcessEvent(EventProcess eventInfo);
+
+    AjaxResult getCountFromMenuIdAndEventType(EventInfo eventInfo);
 }

src/main/java/com/sooka/sponest/event/eventProcess/service/impl/EventProcessServiceImpl.java

@@ -388,11 +388,6 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
                 //设置事件状态为确认事件
                 eventInfoBO.setEventStatus(EVENT_STATUS_2);
 
-                //如果确认的是火情事件, 需要设置事件类型;
-                if (StringUtils.isNotEmpty(eventInfo.getNewEventType())) {
-                    eventInfoBO.setEventType(eventInfo.getNewEventType());
-                }
-
                 //将事件主体移动到确认表
                 eventInfoBO.setTableName("event_process");
                 eventProcessMapper.insertEventInfo(eventInfoBO);
@@ -517,6 +512,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
 
                 //更新主表状态
                 eventInfo.setEventStatus(EVENT_STATUS_3);
+
                 eventProcessMapper.updateEventProcess(eventInfo);
 
             } catch (Exception e) {
@@ -772,6 +768,52 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
 
     }
 
+    @Override
+    @DataScopeMutiDept(deptAlias = "d")
+    public AjaxResult getCountFromMenuIdAndEventType(EventInfo eventInfo) {
+        setSookaDataBase(eventInfo);
+        // 查询每个菜单配置的事件类型数量
+        List<Map<String, Object>> eventTypeCount = eventProcessMapper.getCountFromMenuIdAndEventType(eventInfo);
+
+        Set<String> menuIdSet = new HashSet<>();
+        eventTypeCount.forEach(map->{
+            menuIdSet.add(MapUtils.getString(map, "menuId"));
+        });
+
+        //格式化处理
+        List<Map<String, Object>> resultData = new ArrayList<>();
+        menuIdSet.forEach(menuId->{
+            //菜单总数
+            Long menuCount = 0L;
+            //子集统计
+            List<Map<String, Object>> childrenData = new ArrayList<>();
+            StringBuilder menuName = new StringBuilder();
+
+            // 使用迭代器遍历 eventTypeCount
+            Iterator<Map<String, Object>> iterator = eventTypeCount.iterator();
+            while (iterator.hasNext()) {
+                Map<String, Object> map = iterator.next();
+                if (menuId.equals(MapUtils.getString(map, "menuId"))) {
+                    if(menuName.length() <= 0){
+                        menuName.append(MapUtils.getString(map, "menuName"));
+                    }
+                    Long typeSum = MapUtils.getLong(map, "typeSum");
+                    menuCount += typeSum;
+                    childrenData.add(map);
+                    // 移除当前元素
+                    iterator.remove();
+                }
+            }
+
+            HashMap<String, Object> menuMap = new HashMap<>();
+            menuMap.put("menuName", menuName.toString());
+            menuMap.put("typeSum", menuCount);
+            menuMap.put("children", childrenData);
+            resultData.add(menuMap);
+        });
+        return AjaxResult.success(resultData);
+    }
+
     /**
      * 列表设置附件路径
      *

src/main/resources/mapper/event/eventPostDisasterAssess/FireAssessMapper.xml

@@ -0,0 +1,195 @@
+<?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.sooka.sponest.event.eventPostDisasterAssess.mapper.FireAssessMapper">
+
+    <resultMap type="fireAssess" id="FireAssessResult">
+        <result property="id" column="id"/>
+        <result property="eventId" column="event_id"/>
+        <result property="fireTime" column="fire_time"/>
+        <result property="foundTime" column="found_time"/>
+        <result property="blazesTime" column="blazes_time"/>
+        <result property="address" column="address"/>
+        <result property="firePlace" column="fire_place"/>
+        <result property="foundType" column="found_type"/>
+        <result property="longitudeD" column="longitude_d"/>
+        <result property="longitudeM" column="longitude_m"/>
+        <result property="longitudeS" column="longitude_s"/>
+        <result property="latitudeD" column="latitude_d"/>
+        <result property="latitudeM" column="latitude_m"/>
+        <result property="latitudeS" column="latitude_s"/>
+        <result property="fireSource" column="fire_source"/>
+        <result property="fireType" column="fire_type"/>
+        <result property="fireLevel" column="fire_level"/>
+        <result property="areaTotal" column="area_total"/>
+        <result property="forestLossAreaTotal" column="forest_loss_area_total"/>
+        <result property="originalForestArea" column="original_forest_area"/>
+        <result property="artificialForestArea" column="artificial_forest_area"/>
+        <result property="peopleTotal" column="people_total"/>
+        <result property="blazesTeamNumber" column="blazes_team_number"/>
+        <result property="policeNumber" column="police_number"/>
+        <result property="armyNumber" column="army_number"/>
+        <result property="crowdNumber" column="crowd_number"/>
+        <result property="windExtinguisher" column="wind_extinguisher"/>
+        <result property="secondTool" column="second_tool"/>
+        <result property="waterGun" column="water_gun"/>
+        <result property="elseThings" column="else_things"/>
+        <result property="forestComposition" column="forest_composition"/>
+        <result property="forestToken" column="forest_token"/>
+        <result property="porosities" column="porosities"/>
+        <result property="weather" column="weather"/>
+        <result property="temperature" column="temperature"/>
+        <result property="fireInsuranceLevel" column="fire_insurance_level"/>
+        <result property="windLevel" column="wind_level"/>
+        <result property="windDirection" column="wind_direction"/>
+        <result property="commandUnit" column="command_unit"/>
+        <result property="commandName" column="command_name"/>
+        <result property="commandPosition" column="command_position"/>
+        <result property="surveyUnit" column="survey_unit"/>
+        <result property="surveyName" column="survey_name"/>
+        <result property="surveyPosition" column="survey_position"/>
+        <result property="accidentName" column="accident_name"/>
+        <result property="accidentSex" column="accident_sex"/>
+        <result property="accidentAge" column="accident_age"/>
+        <result property="accidentPosition" column="accident_position"/>
+        <result property="accidentUnit" column="accident_unit"/>
+        <result property="dealType" column="deal_type"/>
+        <result property="dealNumber" column="deal_number"/>
+        <result property="criminalDealNumber" column="criminal_deal_number"/>
+        <result property="accidentDealSituation" column="accident_deal_situation"/>
+        <result property="responsibilityDealSituation" column="responsibility_deal_situation"/>
+        <result property="leadershipDealSituation" column="leadership_deal_situation"/>
+        <result property="townForm" column="town_form"/>
+        <result property="townAudit" column="town_audit"/>
+        <result property="cityForm" column="city_form"/>
+        <result property="cityAudit" column="city_audit"/>
+    </resultMap>
+
+    <insert id="insertFireAssess" parameterType="fireAssess">
+        insert into event_fire_assess
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="eventId != null">event_id,</if>
+            <if test="fireTime != null">fire_time,</if>
+            <if test="foundTime != null">found_time,</if>
+            <if test="blazesTime != null">blazes_time,</if>
+            <if test="address != null">address,</if>
+            <if test="firePlace != null">fire_place,</if>
+            <if test="foundType != null">found_type,</if>
+            <if test="longitudeD != null">longitude_d,</if>
+            <if test="longitudeM != null">longitude_m,</if>
+            <if test="longitudeS != null">longitude_s,</if>
+            <if test="latitudeD != null">latitude_d,</if>
+            <if test="latitudeM != null">latitude_m,</if>
+            <if test="latitudeS != null">latitude_s,</if>
+            <if test="fireSource != null">fire_source,</if>
+            <if test="fireType != null">fire_type,</if>
+            <if test="fireLevel != null">fire_level,</if>
+            <if test="areaTotal != null">area_total,</if>
+            <if test="forestLossAreaTotal != null">forest_loss_area_total,</if>
+            <if test="originalForestArea != null">original_forest_area,</if>
+            <if test="artificialForestArea != null">artificial_forest_area,</if>
+            <if test="peopleTotal != null">people_total,</if>
+            <if test="blazesTeamNumber != null">blazes_team_number,</if>
+            <if test="policeNumber != null">police_number,</if>
+            <if test="armyNumber != null">army_number,</if>
+            <if test="crowdNumber != null">crowd_number,</if>
+            <if test="windExtinguisher != null">wind_extinguisher,</if>
+            <if test="secondTool != null">second_tool,</if>
+            <if test="waterGun != null">water_gun,</if>
+            <if test="elseThings != null">else_things,</if>
+            <if test="forestComposition != null">forest_composition,</if>
+            <if test="forestToken != null">forest_token,</if>
+            <if test="porosities != null">porosities,</if>
+            <if test="weather != null">weather,</if>
+            <if test="temperature != null">temperature,</if>
+            <if test="fireInsuranceLevel != null">fire_insurance_level,</if>
+            <if test="windLevel != null">wind_level,</if>
+            <if test="windDirection != null">wind_direction,</if>
+            <if test="commandUnit != null">command_unit,</if>
+            <if test="commandName != null">command_name,</if>
+            <if test="commandPosition != null">command_position,</if>
+            <if test="surveyUnit != null">survey_unit,</if>
+            <if test="surveyName != null">survey_name,</if>
+            <if test="surveyPosition != null">survey_position,</if>
+            <if test="accidentName != null">accident_name,</if>
+            <if test="accidentSex != null">accident_sex,</if>
+            <if test="accidentAge != null">accident_age,</if>
+            <if test="accidentPosition != null">accident_position,</if>
+            <if test="accidentUnit != null">accident_unit,</if>
+            <if test="dealType != null">deal_type,</if>
+            <if test="dealNumber != null">deal_number,</if>
+            <if test="criminalDealNumber != null">criminal_deal_number,</if>
+            <if test="accidentDealSituation != null">accident_deal_situation,</if>
+            <if test="responsibilityDealSituation != null">responsibility_deal_situation,</if>
+            <if test="leadershipDealSituation != null">leadership_deal_situation,</if>
+            <if test="townForm != null">town_form,</if>
+            <if test="townAudit != null">town_audit,</if>
+            <if test="cityForm != null">city_form,</if>
+            <if test="cityAudit != null">city_audit,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="eventId != null">#{eventId},</if>
+            <if test="fireTime != null">#{fireTime},</if>
+            <if test="foundTime != null">#{foundTime},</if>
+            <if test="blazesTime != null">#{blazesTime},</if>
+            <if test="address != null">#{address},</if>
+            <if test="firePlace != null">#{firePlace},</if>
+            <if test="foundType != null">#{foundType},</if>
+            <if test="longitudeD != null">#{longitudeD},</if>
+            <if test="longitudeM != null">#{longitudeM},</if>
+            <if test="longitudeS != null">#{longitudeS},</if>
+            <if test="latitudeD != null">#{latitudeD},</if>
+            <if test="latitudeM != null">#{latitudeM},</if>
+            <if test="latitudeS != null">#{latitudeS},</if>
+            <if test="fireSource != null">#{fireSource},</if>
+            <if test="fireType != null">#{fireType},</if>
+            <if test="fireLevel != null">#{fireLevel},</if>
+            <if test="areaTotal != null">#{areaTotal},</if>
+            <if test="forestLossAreaTotal != null">#{forestLossAreaTotal},</if>
+            <if test="originalForestArea != null">#{originalForestArea},</if>
+            <if test="artificialForestArea != null">#{artificialForestArea},</if>
+            <if test="peopleTotal != null">#{peopleTotal},</if>
+            <if test="blazesTeamNumber != null">#{blazesTeamNumber},</if>
+            <if test="policeNumber != null">#{policeNumber},</if>
+            <if test="armyNumber != null">#{armyNumber},</if>
+            <if test="crowdNumber != null">#{crowdNumber},</if>
+            <if test="windExtinguisher != null">#{windExtinguisher},</if>
+            <if test="secondTool != null">#{secondTool},</if>
+            <if test="waterGun != null">#{waterGun},</if>
+            <if test="elseThings != null">#{elseThings},</if>
+            <if test="forestComposition != null">#{forestComposition},</if>
+            <if test="forestToken != null">#{forestToken},</if>
+            <if test="porosities != null">#{porosities},</if>
+            <if test="weather != null">#{weather},</if>
+            <if test="temperature != null">#{temperature},</if>
+            <if test="fireInsuranceLevel != null">#{fireInsuranceLevel},</if>
+            <if test="windLevel != null">#{windLevel},</if>
+            <if test="windDirection != null">#{windDirection},</if>
+            <if test="commandUnit != null">#{commandUnit},</if>
+            <if test="commandName != null">#{commandName},</if>
+            <if test="commandPosition != null">#{commandPosition},</if>
+            <if test="surveyUnit != null">#{surveyUnit},</if>
+            <if test="surveyName != null">#{surveyName},</if>
+            <if test="surveyPosition != null">#{surveyPosition},</if>
+            <if test="accidentName != null">#{accidentName},</if>
+            <if test="accidentSex != null">#{accidentSex},</if>
+            <if test="accidentAge != null">#{accidentAge},</if>
+            <if test="accidentPosition != null">#{accidentPosition},</if>
+            <if test="accidentUnit != null">#{accidentUnit},</if>
+            <if test="dealType != null">#{dealType},</if>
+            <if test="dealNumber != null">#{dealNumber},</if>
+            <if test="criminalDealNumber != null">#{criminalDealNumber},</if>
+            <if test="accidentDealSituation != null">#{accidentDealSituation},</if>
+            <if test="responsibilityDealSituation != null">#{responsibilityDealSituation},</if>
+            <if test="leadershipDealSituation != null">#{leadershipDealSituation},</if>
+            <if test="townForm != null">#{townForm},</if>
+            <if test="townAudit != null">#{townAudit},</if>
+            <if test="cityForm != null">#{cityForm},</if>
+            <if test="cityAudit != null">#{cityAudit},</if>
+        </trim>
+    </insert>
+
+</mapper>

src/main/resources/mapper/event/eventPostDisasterAssess/FireLossMapper.xml

@@ -0,0 +1,105 @@
+<?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.sooka.sponest.event.eventPostDisasterAssess.mapper.FireLossMapper">
+
+    <resultMap id="FireLossResultMap" type="fireLoss">
+        <id property="id" column="id"/>
+        <result property="eventId" column="event_id"/>
+        <result property="reportUnit" column="report_unit"/>
+        <result property="reportTimeYear" column="report_time_year"/>
+        <result property="reportTimeMonth" column="report_time_month"/>
+        <result property="reportTimeDay" column="report_time_day"/>
+        <result property="forestFireLossTotal" column="forest_fire_loss_total"/>
+        <result property="fireLossTotal" column="fire_loss_total"/>
+        <result property="forestArea" column="forest_area"/>
+        <result property="forestPrice" column="forest_price"/>
+        <result property="treesNumber" column="trees_number"/>
+        <result property="treesPrice" column="trees_price"/>
+        <result property="minorInjuriesNumber" column="minor_injuries_number"/>
+        <result property="minorInjuriesPrice" column="minor_injuries_price"/>
+        <result property="seriouslyInjuredNumber" column="seriously_injured_number"/>
+        <result property="seriouslyInjuredPrice" column="seriously_injured_price"/>
+        <result property="deathNumber" column="death_number"/>
+        <result property="deathPrice" column="death_price"/>
+        <result property="otherFireLossPrice" column="other_fire_loss_price"/>
+        <result property="blazesPriceTotal" column="blazes_price_total"/>
+        <result property="artificialDays" column="artificial_days"/>
+        <result property="artificialPrice" column="artificial_price"/>
+        <result property="vehicleNumber" column="vehicle_number"/>
+        <result property="carNumber" column="car_number"/>
+        <result property="vehiclePrice" column="vehicle_price"/>
+        <result property="planeNumber" column="plane_number"/>
+        <result property="planePrice" column="plane_price"/>
+        <result property="otherBlazesPrice" column="other_blazes_price"/>
+        <result property="note" column="note"/>
+    </resultMap>
+
+    <insert id="insertFireLoss" parameterType="fireLoss">
+        INSERT INTO event_fire_loss
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="eventId != null">event_id,</if>
+            <if test="reportUnit != null">report_unit,</if>
+            <if test="reportTimeYear != null">report_time_year,</if>
+            <if test="reportTimeMonth != null">report_time_month,</if>
+            <if test="reportTimeDay != null">report_time_day,</if>
+            <if test="forestFireLossTotal != null">forest_fire_loss_total,</if>
+            <if test="fireLossTotal != null">fire_loss_total,</if>
+            <if test="forestArea != null">forest_area,</if>
+            <if test="forestPrice != null">forest_price,</if>
+            <if test="treesNumber != null">trees_number,</if>
+            <if test="treesPrice != null">trees_price,</if>
+            <if test="minorInjuriesNumber != null">minor_injuries_number,</if>
+            <if test="minorInjuriesPrice != null">minor_injuries_price,</if>
+            <if test="seriouslyInjuredNumber != null">seriously_injured_number,</if>
+            <if test="seriouslyInjuredPrice != null">seriously_injured_price,</if>
+            <if test="deathNumber != null">death_number,</if>
+            <if test="deathPrice != null">death_price,</if>
+            <if test="otherFireLossPrice != null">other_fire_loss_price,</if>
+            <if test="blazesPriceTotal != null">blazes_price_total,</if>
+            <if test="artificialDays != null">artificial_days,</if>
+            <if test="artificialPrice != null">artificial_price,</if>
+            <if test="vehicleNumber != null">vehicle_number,</if>
+            <if test="carNumber != null">car_number,</if>
+            <if test="vehiclePrice != null">vehicle_price,</if>
+            <if test="planeNumber != null">plane_number,</if>
+            <if test="planePrice != null">plane_price,</if>
+            <if test="otherBlazesPrice != null">other_blazes_price,</if>
+            <if test="note != null">note,</if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="eventId != null">#{eventId},</if>
+            <if test="reportUnit != null">#{reportUnit},</if>
+            <if test="reportTimeYear != null">#{reportTimeYear},</if>
+            <if test="reportTimeMonth != null">#{reportTimeMonth},</if>
+            <if test="reportTimeDay != null">#{reportTimeDay},</if>
+            <if test="forestFireLossTotal != null">#{forestFireLossTotal},</if>
+            <if test="fireLossTotal != null">#{fireLossTotal},</if>
+            <if test="forestArea != null">#{forestArea},</if>
+            <if test="forestPrice != null">#{forestPrice},</if>
+            <if test="treesNumber != null">#{treesNumber},</if>
+            <if test="treesPrice != null">#{treesPrice},</if>
+            <if test="minorInjuriesNumber != null">#{minorInjuriesNumber},</if>
+            <if test="minorInjuriesPrice != null">#{minorInjuriesPrice},</if>
+            <if test="seriouslyInjuredNumber != null">#{seriouslyInjuredNumber},</if>
+            <if test="seriouslyInjuredPrice != null">#{seriouslyInjuredPrice},</if>
+            <if test="deathNumber != null">#{deathNumber},</if>
+            <if test="deathPrice != null">#{deathPrice},</if>
+            <if test="otherFireLossPrice != null">#{otherFireLossPrice},</if>
+            <if test="blazesPriceTotal != null">#{blazesPriceTotal},</if>
+            <if test="artificialDays != null">#{artificialDays},</if>
+            <if test="artificialPrice != null">#{artificialPrice},</if>
+            <if test="vehicleNumber != null">#{vehicleNumber},</if>
+            <if test="carNumber != null">#{carNumber},</if>
+            <if test="vehiclePrice != null">#{vehiclePrice},</if>
+            <if test="planeNumber != null">#{planeNumber},</if>
+            <if test="planePrice != null">#{planePrice},</if>
+            <if test="otherBlazesPrice != null">#{otherBlazesPrice},</if>
+            <if test="note != null">#{note},</if>
+        </trim>
+    </insert>
+
+</mapper>

src/main/resources/mapper/event/eventPostDisasterAssess/RegionalFlagMapper.xml

@@ -0,0 +1,22 @@
+<?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.sooka.sponest.event.eventPostDisasterAssess.mapper.RegionalFlagMapper">
+
+    <resultMap id="FireLossResultMap" type="regionalFlag">
+        <id property="id" column="id"/>
+        <result property="eventId" column="event_id"/>
+        <result property="longitude" column=""/>
+        <result property="latitude" column=""/>
+        <result property="sort" column=""/>
+    </resultMap>
+
+    <insert id="insertRegionalFlagList" parameterType="list">
+        INSERT INTO event_regional_flag (id, event_id, longitude, latitude, sort) VALUES
+        <foreach collection="list" item="regionalFlag" open="(" separator="),(" close=")">
+            #{regionalFlag.id}, #{regionalFlag.eventId}, #{regionalFlag.longitude}, #{regionalFlag.latitude}, #{regionalFlag.sort}
+        </foreach>
+    </insert>
+
+</mapper>

src/main/resources/mapper/event/eventProcess/EventProcessMapper.xml

@@ -552,6 +552,32 @@
     <select id="selectProcessAttachFromUnconfirmed" resultMap="EventInfoUnconfirmedResult">
         SELECT event_id FROM event_compensation
     </select>
+
+    <select id="getCountFromMenuIdAndEventType" parameterType="EventInfo" resultType="map">
+        SELECT a.menu_id menuId, a.menu_name menuName, a.event_type eventType, et.event_type_name AS eventTypeName, a.typeSum
+        FROM event_type et
+        LEFT JOIN (
+            SELECT sm.menu_id, smv.remark AS menu_name, sm.event_type_xl AS event_type, COALESCE ( cnt.count, 0 ) AS typeSum
+            FROM (
+                SELECT DISTINCT menu_id, event_type_xl FROM onest_system.sys_menu_event_type
+                UNION
+                SELECT DISTINCT menu_id, event_type FROM onest_system.sys_menu_event_type WHERE event_type = 1
+            ) sm
+            LEFT JOIN (
+                SELECT event_type, COUNT( 1 ) AS count
+                FROM event_process
+                GROUP BY event_type
+                UNION
+                SELECT event_type, COUNT( 1 )
+                FROM event_unconfirmed
+                GROUP BY event_type
+            ) cnt ON sm.event_type_xl = cnt.event_type
+            LEFT JOIN ${database_system}.sys_menu_visu smv ON sm.menu_id = smv.menu_id
+            WHERE smv.STATUS = 0 AND menu_type = 'ZC'
+        ) a ON a.event_type = et.id
+        WHERE menu_id IS NOT NULL
+        ORDER BY a.menu_id, a.event_type
+    </select>
     <!-- **************************************** 业务块 结束 *********************************************** -->