fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/DutyEmpController.java

@@ -73,7 +73,7 @@ public class DutyEmpController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:dutyEmp:query')")
     @GetMapping("/{id}")
     public AjaxResult<DutyEmpVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+                                                  @PathVariable("id") String id) {
         return AjaxResult.success(iDutyEmpService.queryById(id));
     }
 
@@ -109,7 +109,7 @@ public class DutyEmpController extends BaseController {
     @Log(title = "值班排班信息" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(iDutyEmpService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/DutyReportController.java

@@ -71,7 +71,7 @@ public class DutyReportController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:dutyReport:query')")
     @GetMapping("/{id}")
     public AjaxResult<DutyReportVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+                                                  @PathVariable("id") String id) {
         return AjaxResult.success(iDutyReportService.queryById(id));
     }
 
@@ -107,7 +107,7 @@ public class DutyReportController extends BaseController {
     @Log(title = "值班报告信息" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(iDutyReportService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -1,18 +1,26 @@
 package com.ruoyi.web.controller.zhdd;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zhdd.domain.Incident;
 import com.ruoyi.zhdd.domain.IncidentProcess;
 import com.ruoyi.zhdd.domain.IncidentTask;
+import com.ruoyi.zhdd.domain.IncidentTaskPerson;
 import com.ruoyi.zhdd.domain.Plan;
 import com.ruoyi.zhdd.domain.bo.IncidentTaskBo;
+import com.ruoyi.zhdd.domain.bo.IncidentTasksBo;
 import com.ruoyi.zhdd.domain.vo.PlanVo;
+import com.ruoyi.zhdd.domain.vo.ResourceVo;
 import com.ruoyi.zhdd.service.IIncidentProcessService;
+import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
 import com.ruoyi.zhdd.service.IIncidentTaskService;
 import com.ruoyi.zhdd.service.IPlanService;
 import com.ruoyi.zhdd.service.IPlanTaskService;
@@ -58,6 +66,8 @@ public class IncidentController extends BaseController {
 
     private final IIncidentTaskService incidentTaskService;
 
+    private final IIncidentTaskPersonService incidentTaskPersonService;
+
     private final IIncidentProcessService iIncidentProcessService;
 
     private final IPlanTaskService planTaskService;
@@ -93,7 +103,7 @@ public class IncidentController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:incident:query')")
     @GetMapping("/{id}")
     public AjaxResult<Map<String, Object>> getInfo(@NotNull(message = "主键不能为空")
-                                          @PathVariable("id") Long id) {
+                                                   @PathVariable("id") String id) {
         Map<String, Object> map = new HashMap<>();
         IncidentVo incidentVo = iIncidentService.queryById(id);
         map.put("baseInfo", incidentVo);
@@ -105,8 +115,9 @@ public class IncidentController extends BaseController {
             map.put("baseTask", null);
         }
         map.put("task", incidentTaskService.list(Wrappers.<IncidentTask>lambdaQuery().eq(IncidentTask::getIncidentId, id)));
+        map.put("taskPerson", incidentTaskPersonService.list(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentId, id)));
         map.put("process", iIncidentProcessService.list(Wrappers.<IncidentProcess>lambdaQuery()
-            .eq(IncidentProcess::getIncidentId, id).orderByDesc(IncidentProcess::getCreateTime)));
+            .eq(IncidentProcess::getIncidentId, id).orderByAsc(IncidentProcess::getCreateTime)));
         return AjaxResult.success(map);
     }
 
@@ -144,24 +155,45 @@ public class IncidentController extends BaseController {
     @Log(title = "事件基础", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                   @PathVariable Long[] ids) {
+                                   @PathVariable String[] ids) {
         return toAjax(iIncidentService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 
-    @ApiOperation("新增事件任务")
-    @Log(title = "事件任务", businessType = BusinessType.INSERT)
+    @ApiOperation("新增事件方案")
+    @Log(title = "事件方案", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/task")
-    public AjaxResult<Void> addTask(@Validated(AddGroup.class) @RequestBody IncidentTaskBo bo) {
-        bo.setSource(2);
+    public AjaxResult<Void> addTask(@Validated(AddGroup.class) @RequestBody IncidentTasksBo bo) {
         return toAjax(incidentTaskService.insertByBo(bo) ? 1 : 0);
     }
 
-    @ApiOperation("删除事件任务")
-    @Log(title = "事件任务", businessType = BusinessType.DELETE)
+    @ApiOperation("修改事件方案")
+    @Log(title = "事件方案", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/task")
+    public AjaxResult<Void> editTask(@Validated(AddGroup.class) @RequestBody IncidentTaskBo bo) {
+        return toAjax(incidentTaskService.updateByBo(bo) ? 1 : 0);
+    }
+
+    @ApiOperation("删除事件方案")
+    @Log(title = "事件方案", businessType = BusinessType.DELETE)
     @DeleteMapping("/task/{ids}")
     public AjaxResult<Void> removeTask(@NotEmpty(message = "主键不能为空")
-                                   @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(incidentTaskService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
+
+    @ApiOperation("查询事件-用于首页地图展示")
+    @GetMapping("/location")
+    public AjaxResult<Map<String, List<IncidentVo>>> queryIncidentLocation() {
+        List<IncidentVo> list = iIncidentService.listVo(Wrappers.<Incident>lambdaQuery().in(Incident::getStatus, 1, 2, 3));
+        Map<Integer, List<IncidentVo>> collect = list.stream().collect(Collectors.groupingBy(IncidentVo::getStatus, Collectors.mapping(a -> a, Collectors.toList())));
+        Map<String, List<IncidentVo>> result = new HashMap<>();
+        result.put("预警事件", CollUtil.defaultIfEmpty(collect.get(1), new ArrayList<>()));
+        result.put("待派发", CollUtil.defaultIfEmpty(collect.get(2), new ArrayList<>()));
+        result.put("待处置", CollUtil.defaultIfEmpty(collect.get(3), new ArrayList<>()));
+        return AjaxResult.success(result);
+    }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentProcessController.java

@@ -71,7 +71,7 @@ public class IncidentProcessController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:incidentProcess:query')")
     @GetMapping("/{id}")
     public AjaxResult<IncidentProcessVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+                                                  @PathVariable("id") String id) {
         return AjaxResult.success(iIncidentProcessService.queryById(id));
     }
 
@@ -107,7 +107,7 @@ public class IncidentProcessController extends BaseController {
     @Log(title = "事件处置流程" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(iIncidentProcessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentTaskPersonController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.zhdd;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
+import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
+import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 事件处置方案人员Controller
+ *
+ * @author xintong
+ * @date 2021-11-27
+ */
+@Validated
+@Api(value = "事件处置方案人员控制器", tags = {"事件处置方案人员管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/zhdd/incidentTaskPerson")
+public class IncidentTaskPersonController extends BaseController {
+
+    private final IIncidentTaskPersonService iIncidentTaskPersonService;
+
+    /**
+     * 查询事件处置方案人员列表
+     */
+    @ApiOperation("查询事件处置方案人员列表")
+    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:list')")
+    @GetMapping("/list")
+    public TableDataInfo<IncidentTaskPersonVo> list(@Validated(QueryGroup.class) IncidentTaskPersonBo bo) {
+        return iIncidentTaskPersonService.queryPageList(bo);
+    }
+
+    /**
+     * 导出事件处置方案人员列表
+     */
+    @ApiOperation("导出事件处置方案人员列表")
+    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:export')")
+    @Log(title = "事件处置方案人员", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated IncidentTaskPersonBo bo, HttpServletResponse response) {
+        List<IncidentTaskPersonVo> list = iIncidentTaskPersonService.queryList(bo);
+        ExcelUtil.exportExcel(list, "事件处置方案人员", IncidentTaskPersonVo.class, response);
+    }
+
+    /**
+     * 获取事件处置方案人员详细信息
+     */
+    @ApiOperation("获取事件处置方案人员详细信息")
+    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<IncidentTaskPersonVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") String id) {
+        return AjaxResult.success(iIncidentTaskPersonService.queryById(id));
+    }
+
+    /**
+     * 新增事件处置方案人员
+     */
+    @ApiOperation("新增事件处置方案人员")
+    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:add')")
+    @Log(title = "事件处置方案人员", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody IncidentTaskPersonBo bo) {
+        return toAjax(iIncidentTaskPersonService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改事件处置方案人员
+     */
+    @ApiOperation("修改事件处置方案人员")
+    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:edit')")
+    @Log(title = "事件处置方案人员", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody IncidentTaskPersonBo bo) {
+        return toAjax(iIncidentTaskPersonService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除事件处置方案人员
+     */
+    @ApiOperation("删除事件处置方案人员")
+    @PreAuthorize("@ss.hasPermi('zhdd:incidentTaskPerson:remove')")
+    @Log(title = "事件处置方案人员" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable String[] ids) {
+        return toAjax(iIncidentTaskPersonService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/PlanController.java

@@ -62,7 +62,7 @@ public class PlanController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:plan:query')")
     @GetMapping("/{id}")
     public AjaxResult<PlanVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+                                                  @PathVariable("id") String id) {
         return AjaxResult.success(iPlanService.queryById(id));
     }
 
@@ -98,7 +98,7 @@ public class PlanController extends BaseController {
     @Log(title = "预案管理" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(iPlanService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/PlanTaskController.java

@@ -71,7 +71,7 @@ public class PlanTaskController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:planTask:query')")
     @GetMapping("/{id}")
     public AjaxResult<PlanTaskVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+                                                  @PathVariable("id") String id) {
         return AjaxResult.success(iPlanTaskService.queryById(id));
     }
 
@@ -107,7 +107,7 @@ public class PlanTaskController extends BaseController {
     @Log(title = "预案任务管理" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(iPlanTaskService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceController.java

@@ -1,9 +1,14 @@
 package com.ruoyi.web.controller.zhdd;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollUtil;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -71,7 +76,7 @@ public class ResourceController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:resource:query')")
     @GetMapping("/{id}")
     public AjaxResult<ResourceVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+                                                  @PathVariable("id") String id) {
         return AjaxResult.success(iResourceService.queryById(id));
     }
 
@@ -107,7 +112,19 @@ public class ResourceController extends BaseController {
     @Log(title = "应急资源" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(iResourceService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
+
+    @ApiOperation("查询所有应急资源信息")
+    @GetMapping("/location")
+    public AjaxResult<Map<String,List<ResourceVo>>> queryResourceLocation(ResourceBo bo) {
+        List<ResourceVo> list = iResourceService.queryList(bo);
+        Map<Integer, List<ResourceVo>> collect = list.stream().collect(Collectors.groupingBy(ResourceVo::getResourceType, Collectors.mapping(a -> a, Collectors.toList())));
+        Map<String,List<ResourceVo>> result = new HashMap<>();
+        result.put("应急仓库", CollUtil.defaultIfEmpty(collect.get(1), new ArrayList<>()));
+        result.put("应急队伍", CollUtil.defaultIfEmpty(collect.get(2), new ArrayList<>()));
+        result.put("应急车队", CollUtil.defaultIfEmpty(collect.get(3), new ArrayList<>()));
+        return AjaxResult.success(result);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceDetailController.java

@@ -71,7 +71,7 @@ public class ResourceDetailController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:resourceDetail:query')")
     @GetMapping("/{id}")
     public AjaxResult<ResourceDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                                  @PathVariable("id") Long id) {
+                                                  @PathVariable("id") String id) {
         return AjaxResult.success(iResourceDetailService.queryById(id));
     }
 
@@ -107,7 +107,7 @@ public class ResourceDetailController extends BaseController {
     @Log(title = "应急资源明细" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
+                                       @PathVariable String[] ids) {
         return toAjax(iResourceDetailService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
     }
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/DutyEmp.java

@@ -27,7 +27,7 @@ public class DutyEmp implements Serializable {
      * $column.columnComment
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 日期

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/DutyReport.java

@@ -27,7 +27,7 @@ public class DutyReport implements Serializable {
      * $column.columnComment
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 报告内容

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Incident.java

@@ -27,7 +27,7 @@ public class Incident implements Serializable {
      * 主键id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 事件类型

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentProcess.java

@@ -27,12 +27,12 @@ public class IncidentProcess implements Serializable {
      * 主键id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 所属事件id
      */
-    private Long incidentId;
+    private String incidentId;
 
     /**
      * 处置过程

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentTask.java

@@ -32,12 +32,12 @@ public class IncidentTask implements Serializable {
      * 主键id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 所属事件id
      */
-    private Long incidentId;
+    private String incidentId;
 
     private String taskName;
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/IncidentTaskPerson.java

@@ -0,0 +1,59 @@
+package com.ruoyi.zhdd.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * 事件处置方案人员对象 b_incident_task_person
+ *
+ * @author xintong
+ * @date 2021-11-27
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("b_incident_task_person")
+public class IncidentTaskPerson implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 事件id
+     */
+    private String incidentId;
+
+    /**
+     * 人员职位
+     */
+    private String position;
+
+    /**
+     * 人员姓名
+     */
+    private String person;
+
+    /**
+     * $column.columnComment
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * $column.columnComment
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Plan.java

@@ -27,7 +27,7 @@ public class Plan implements Serializable {
      * 主键id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 预案名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/PlanFile.java

@@ -32,12 +32,12 @@ public class PlanFile implements Serializable {
      * 任务id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 所属预案id
      */
-    private Long planId;
+    private String planId;
 
     /**
      *

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/PlanTask.java

@@ -27,12 +27,12 @@ public class PlanTask implements Serializable {
      * 任务id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 所属预案id
      */
-    private Long planId;
+    private String planId;
 
     /**
      * 预案等级

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Resource.java

@@ -27,7 +27,7 @@ public class Resource implements Serializable {
      * $column.columnComment
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 资源类型。1-仓库。2-队伍.3-车辆
@@ -79,6 +79,8 @@ public class Resource implements Serializable {
      */
     private String contactPhone;
 
+    private String carType;
+
     /**
      * $column.columnComment
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/ResourceDetail.java

@@ -27,12 +27,12 @@ public class ResourceDetail implements Serializable {
      * $column.columnComment
      */
     @TableId(value = "id")
-    private Long id;
+    private String id;
 
     /**
      * 资源id
      */
-    private Long resourceId;
+    private String resourceId;
 
     /**
      * 名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/DutyEmpBo.java

@@ -28,7 +28,7 @@ public class DutyEmpBo extends BaseEntity {
      * $column.columnComment
      */
     @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
+    private String id;
 
     /**
      * 日期

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/DutyReportBo.java

@@ -30,7 +30,7 @@ public class DutyReportBo extends BaseEntity {
      * $column.columnComment
      */
     @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
+    private String id;
 
     /**
      * 报告内容

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentBo.java

@@ -28,20 +28,20 @@ public class IncidentBo extends BaseEntity {
      * 主键id
      */
     @ApiModelProperty(value = "主键id")
-    private Long id;
+    private String id;
 
     /**
      * 事件类型
      */
     @ApiModelProperty(value = "事件类型")
-    @NotBlank(message = "type不能为空", groups = { AddGroup.class })
+    @NotNull(message = "type不能为空", groups = { AddGroup.class })
     private Integer type;
 
     /**
      * 事件等级
      */
     @ApiModelProperty(value = "事件等级")
-    @NotBlank(message = "level不能为空", groups = { AddGroup.class })
+    @NotNull(message = "level不能为空", groups = { AddGroup.class })
     private Integer level;
 
     /**

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentProcessBo.java

@@ -28,14 +28,14 @@ public class IncidentProcessBo extends BaseEntity {
      * 主键id
      */
     @ApiModelProperty(value = "主键id")
-    private Long id;
+    private String id;
 
     /**
      * 所属事件id
      */
     @ApiModelProperty(value = "所属事件id")
-    @NotNull(message = "incidentId不能为空", groups = { AddGroup.class })
-    private Long incidentId;
+    @NotBlank(message = "incidentId不能为空", groups = { AddGroup.class })
+    private String incidentId;
 
     /**
      * 处置过程

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentTaskBo.java

@@ -3,6 +3,7 @@ package com.ruoyi.zhdd.domain.bo;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.zhdd.domain.IncidentTaskPerson;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,6 +11,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 事件处置流程业务对象 b_incident_process
@@ -27,21 +29,21 @@ public class IncidentTaskBo extends BaseEntity {
      * 主键id
      */
     @ApiModelProperty(value = "主键id")
-    private Long id;
+    private String id;
 
     /**
      * 所属事件id
      */
     @ApiModelProperty(value = "所属事件id")
-    @NotNull(message = "incidentId不能为空", groups = { AddGroup.class })
-    private Long incidentId;
+    @NotBlank(message = "incidentId不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String incidentId;
 
     @ApiModelProperty(value = "任务名称")
-    @NotBlank(message = "taskName不能为空", groups = { AddGroup.class })
+    @NotBlank(message = "taskName不能为空", groups = { AddGroup.class, EditGroup.class })
     private String taskName;
 
     @ApiModelProperty(value = "任务描述")
-    @NotBlank(message = "taskDes不能为空", groups = { AddGroup.class })
+//    @NotBlank(message = "taskDes不能为空", groups = { AddGroup.class })
     private String taskDes;
 
     private Integer source;

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentTaskPersonBo.java

@@ -0,0 +1,76 @@
+package com.ruoyi.zhdd.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 事件处置方案人员业务对象 b_incident_task_person
+ *
+ * @author xintong
+ * @date 2021-11-27
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("事件处置方案人员业务对象")
+public class IncidentTaskPersonBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**
+     * 事件id
+     */
+    @ApiModelProperty(value = "事件id")
+    private String incidentId;
+
+    /**
+     * 人员职位
+     */
+    @ApiModelProperty(value = "人员职位")
+    private String position;
+
+    /**
+     * 人员姓名
+     */
+    @ApiModelProperty(value = "人员姓名")
+    private String person;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/IncidentTasksBo.java

@@ -0,0 +1,24 @@
+package com.ruoyi.zhdd.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.zhdd.domain.IncidentTask;
+import com.ruoyi.zhdd.domain.IncidentTaskPerson;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @Description: TODO
+ * @Author: huangcheng
+ * @Date: 2021/11/27
+ * @Version V1.0
+ */
+@Data
+public class IncidentTasksBo {
+
+    @NotBlank(message = "incidentId不能为空", groups = { AddGroup.class })
+    private String incidentId;
+    private List<IncidentTask> incidentTasks;
+    private List<IncidentTaskPerson> incidentTaskPeoples;
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/PlanBo.java

@@ -31,7 +31,7 @@ public class PlanBo extends BaseEntity {
      * 主键id
      */
     @ApiModelProperty(value = "主键id")
-    private Long id;
+    private String id;
 
     /**
      * 预案名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/PlanFileBo.java

@@ -27,14 +27,14 @@ public class PlanFileBo extends BaseEntity {
      * 任务id
      */
     @ApiModelProperty(value = "任务id")
-    private Long id;
+    private String id;
 
     /**
      * 所属预案id
      */
     @ApiModelProperty(value = "所属预案id")
-    @NotNull(message = "planId不能为空", groups = { AddGroup.class })
-    private Long planId;
+    @NotBlank(message = "planId不能为空", groups = { AddGroup.class })
+    private String planId;
 
     /**
      * 任务名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/PlanTaskBo.java

@@ -28,13 +28,13 @@ public class PlanTaskBo extends BaseEntity {
      * 任务id
      */
     @ApiModelProperty(value = "任务id")
-    private Long id;
+    private String id;
 
     /**
      * 所属预案id
      */
     @ApiModelProperty(value = "所属预案id")
-    private Long planId;
+    private String planId;
 
     /**
      * 预案等级

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/ResourceBo.java

@@ -29,8 +29,8 @@ public class ResourceBo extends BaseEntity {
      * $column.columnComment
      */
     @ApiModelProperty(value = "$column.columnComment")
-    @NotNull(message = "id不能为空", groups = { EditGroup.class })
-    private Long id;
+    @NotBlank(message = "id不能为空", groups = { EditGroup.class })
+    private String id;
 
     /**
      * 资源类型。1-仓库。2-队伍.3-车辆
@@ -90,6 +90,8 @@ public class ResourceBo extends BaseEntity {
     @NotBlank(message = "contactName不能为空", groups = { AddGroup.class, EditGroup.class })
     private String contactName;
 
+    private String carType;
+
     /**
      * 联系电话
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/ResourceDetailBo.java

@@ -28,13 +28,13 @@ public class ResourceDetailBo extends BaseEntity {
      * $column.columnComment
      */
     @ApiModelProperty(value = "$column.columnComment")
-    private Long id;
+    private String id;
 
     /**
      * 资源id
      */
     @ApiModelProperty(value = "资源id")
-    private Long resourceId;
+    private String resourceId;
 
     /**
      * 名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/DutyEmpVo.java

@@ -28,7 +28,7 @@ public class DutyEmpVo {
      *  $pkColumn.columnComment
      */
 	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
+	private String id;
 
     /**
      * 日期

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/DutyReportVo.java

@@ -30,7 +30,7 @@ public class DutyReportVo {
      *  $pkColumn.columnComment
      */
 	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
+	private String id;
 
     /**
      * 报告内容

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentProcessVo.java

@@ -28,14 +28,14 @@ public class IncidentProcessVo {
      *  主键id
      */
 	@ApiModelProperty("主键id")
-	private Long id;
+	private String id;
 
     /**
      * 所属事件id
      */
 	@ExcelProperty(value = "所属事件id")
 	@ApiModelProperty("所属事件id")
-	private Long incidentId;
+	private String incidentId;
 
     /**
      * 处置过程

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentTaskPersonVo.java

@@ -0,0 +1,55 @@
+package com.ruoyi.zhdd.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 事件处置方案人员视图对象 b_incident_task_person
+ *
+ * @author xintong
+ * @date 2021-11-27
+ */
+@Data
+@ApiModel("事件处置方案人员视图对象")
+@ExcelIgnoreUnannotated
+public class IncidentTaskPersonVo {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+     *  主键
+     */
+	@ApiModelProperty("主键")
+	private String id;
+
+    /**
+     * 事件id
+     */
+	@ExcelProperty(value = "事件id")
+	@ApiModelProperty("事件id")
+	private String incidentId;
+
+    /**
+     * 人员职位
+     */
+	@ExcelProperty(value = "人员职位")
+	@ApiModelProperty("人员职位")
+	private String position;
+
+    /**
+     * 人员姓名
+     */
+	@ExcelProperty(value = "人员姓名")
+	@ApiModelProperty("人员姓名")
+	private String person;
+
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentTaskVo.java

@@ -26,14 +26,14 @@ public class IncidentTaskVo {
      *  主键id
      */
 	@ApiModelProperty("主键id")
-	private Long id;
+	private String id;
 
     /**
      * 所属事件id
      */
 	@ExcelProperty(value = "所属事件id")
 	@ApiModelProperty("所属事件id")
-	private Long incidentId;
+	private String incidentId;
 
     @ApiModelProperty(value = "任务名称")
     private String taskName;

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentVo.java

@@ -28,7 +28,7 @@ public class IncidentVo {
      *  主键id
      */
 	@ApiModelProperty("主键id")
-	private Long id;
+	private String id;
 
     /**
      * 事件类型

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/PlanFileVo.java

@@ -26,14 +26,14 @@ public class PlanFileVo {
      *  任务id
      */
 	@ApiModelProperty("任务id")
-	private Long id;
+	private String id;
 
     /**
      * 所属预案id
      */
 	@ExcelProperty(value = "所属预案id")
 	@ApiModelProperty("所属预案id")
-	private Long planId;
+	private String planId;
 
     /**
      * 任务名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/PlanTaskVo.java

@@ -28,14 +28,14 @@ public class PlanTaskVo {
      *  任务id
      */
 	@ApiModelProperty("任务id")
-	private Long id;
+	private String id;
 
     /**
      * 所属预案id
      */
 	@ExcelProperty(value = "所属预案id")
 	@ApiModelProperty("所属预案id")
-	private Long planId;
+	private String planId;
 
     /**
      * 预案等级

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/PlanVo.java

@@ -29,7 +29,7 @@ public class PlanVo {
      *  主键id
      */
 	@ApiModelProperty("主键id")
-	private Long id;
+	private String id;
 
     /**
      * 预案名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceDetailVo.java

@@ -28,14 +28,14 @@ public class ResourceDetailVo {
      *  $pkColumn.columnComment
      */
 	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
+	private String id;
 
     /**
      * 资源id
      */
 	@ExcelProperty(value = "资源id")
 	@ApiModelProperty("资源id")
-	private Long resourceId;
+	private String resourceId;
 
     /**
      * 名称

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceVo.java

@@ -29,7 +29,7 @@ public class ResourceVo {
      *  $pkColumn.columnComment
      */
 	@ApiModelProperty("$pkColumn.columnComment")
-	private Long id;
+	private String id;
 
     /**
      * 资源类型。1-仓库。2-队伍.3-车辆
@@ -73,6 +73,8 @@ public class ResourceVo {
 	@ApiModelProperty("管理单位")
 	private String manageUnit;
 
+    private String carType;
+
     /**
      * 人数
      */

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/IncidentTaskPersonMapper.java

@@ -0,0 +1,16 @@
+package com.ruoyi.zhdd.mapper;
+
+import com.ruoyi.zhdd.domain.IncidentTaskPerson;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import org.apache.ibatis.annotations.CacheNamespace;
+
+/**
+ * 事件处置方案人员Mapper接口
+ *
+ * @author xintong
+ * @date 2021-11-27
+ */
+public interface IncidentTaskPersonMapper extends BaseMapperPlus<IncidentTaskPerson> {
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/ResourceMapper.java

@@ -3,7 +3,12 @@ package com.ruoyi.zhdd.mapper;
 import com.ruoyi.zhdd.domain.Resource;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache;
+import com.ruoyi.zhdd.domain.vo.ResourceVo;
 import org.apache.ibatis.annotations.CacheNamespace;
+import org.apache.ibatis.annotations.MapKey;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 应急资源Mapper接口

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IDutyEmpService.java

@@ -20,7 +20,7 @@ public interface IDutyEmpService extends IServicePlus<DutyEmp, DutyEmpVo> {
 	 * 查询单个
 	 * @return
 	 */
-	DutyEmpVo queryById(Long id);
+	DutyEmpVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -52,5 +52,5 @@ public interface IDutyEmpService extends IServicePlus<DutyEmp, DutyEmpVo> {
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IDutyReportService.java

@@ -20,7 +20,7 @@ public interface IDutyReportService extends IServicePlus<DutyReport, DutyReportV
 	 * 查询单个
 	 * @return
 	 */
-	DutyReportVo queryById(Long id);
+	DutyReportVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -52,5 +52,5 @@ public interface IDutyReportService extends IServicePlus<DutyReport, DutyReportV
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IIncidentProcessService.java

@@ -20,7 +20,7 @@ public interface IIncidentProcessService extends IServicePlus<IncidentProcess, I
 	 * 查询单个
 	 * @return
 	 */
-	IncidentProcessVo queryById(Long id);
+	IncidentProcessVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -52,5 +52,5 @@ public interface IIncidentProcessService extends IServicePlus<IncidentProcess, I
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IIncidentService.java

@@ -20,7 +20,7 @@ public interface IIncidentService extends IServicePlus<Incident, IncidentVo> {
 	 * 查询单个
 	 * @return
 	 */
-	IncidentVo queryById(Long id);
+	IncidentVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -52,5 +52,5 @@ public interface IIncidentService extends IServicePlus<Incident, IncidentVo> {
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IIncidentTaskPersonService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.zhdd.service;
+
+import com.ruoyi.zhdd.domain.IncidentTaskPerson;
+import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
+import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 事件处置方案人员Service接口
+ *
+ * @author xintong
+ * @date 2021-11-27
+ */
+public interface IIncidentTaskPersonService extends IServicePlus<IncidentTaskPerson, IncidentTaskPersonVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	IncidentTaskPersonVo queryById(String id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<IncidentTaskPersonVo> queryPageList(IncidentTaskPersonBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<IncidentTaskPersonVo> queryList(IncidentTaskPersonBo bo);
+
+	/**
+	 * 根据新增业务对象插入事件处置方案人员
+	 * @param bo 事件处置方案人员新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(IncidentTaskPersonBo bo);
+
+	/**
+	 * 根据编辑业务对象修改事件处置方案人员
+	 * @param bo 事件处置方案人员编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(IncidentTaskPersonBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IIncidentTaskService.java

@@ -6,6 +6,7 @@ import com.ruoyi.zhdd.domain.IncidentProcess;
 import com.ruoyi.zhdd.domain.IncidentTask;
 import com.ruoyi.zhdd.domain.bo.IncidentProcessBo;
 import com.ruoyi.zhdd.domain.bo.IncidentTaskBo;
+import com.ruoyi.zhdd.domain.bo.IncidentTasksBo;
 import com.ruoyi.zhdd.domain.vo.IncidentProcessVo;
 import com.ruoyi.zhdd.domain.vo.IncidentTaskVo;
 
@@ -23,7 +24,7 @@ public interface IIncidentTaskService extends IServicePlus<IncidentTask, Inciden
 	 * 查询单个
 	 * @return
 	 */
-	IncidentTaskVo queryById(Long id);
+	IncidentTaskVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -40,7 +41,7 @@ public interface IIncidentTaskService extends IServicePlus<IncidentTask, Inciden
 	 * @param bo 事件处置流程新增业务对象
 	 * @return
 	 */
-	Boolean insertByBo(IncidentTaskBo bo);
+	Boolean insertByBo(IncidentTasksBo bo);
 
 	/**
 	 * 根据编辑业务对象修改事件处置流程
@@ -55,5 +56,5 @@ public interface IIncidentTaskService extends IServicePlus<IncidentTask, Inciden
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IPlanFileService.java

@@ -20,7 +20,7 @@ public interface IPlanFileService extends IServicePlus<PlanFile, PlanFileVo> {
 	 * 查询单个
 	 * @return
 	 */
-	PlanFileVo queryById(Long id);
+	PlanFileVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -52,5 +52,5 @@ public interface IPlanFileService extends IServicePlus<PlanFile, PlanFileVo> {
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IPlanService.java

@@ -21,7 +21,7 @@ public interface IPlanService extends IServicePlus<Plan, PlanVo> {
 	 * 查询单个
 	 * @return
 	 */
-	PlanVo queryById(Long id);
+	PlanVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -53,7 +53,7 @@ public interface IPlanService extends IServicePlus<Plan, PlanVo> {
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     List<PlanTask> queryTask(String dept, Integer type, Integer level);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IPlanTaskService.java

@@ -21,7 +21,7 @@ public interface IPlanTaskService extends IServicePlus<PlanTask, PlanTaskVo> {
 	 * 查询单个
 	 * @return
 	 */
-	PlanTaskVo queryById(Long id);
+	PlanTaskVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -53,7 +53,7 @@ public interface IPlanTaskService extends IServicePlus<PlanTask, PlanTaskVo> {
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    Map<Integer, List<PlanTaskVo>> queryPlanTaskByPlanId(Long planId);
+    Map<Integer, List<PlanTaskVo>> queryPlanTaskByPlanId(String planId);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IResourceDetailService.java

@@ -20,7 +20,7 @@ public interface IResourceDetailService extends IServicePlus<ResourceDetail, Res
 	 * 查询单个
 	 * @return
 	 */
-	ResourceDetailVo queryById(Long id);
+	ResourceDetailVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -52,5 +52,5 @@ public interface IResourceDetailService extends IServicePlus<ResourceDetail, Res
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IResourceService.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应急资源Service接口
@@ -20,7 +21,7 @@ public interface IResourceService extends IServicePlus<Resource, ResourceVo> {
 	 * 查询单个
 	 * @return
 	 */
-	ResourceVo queryById(Long id);
+	ResourceVo queryById(String id);
 
 	/**
 	 * 查询列表
@@ -52,7 +53,7 @@ public interface IResourceService extends IServicePlus<Resource, ResourceVo> {
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     boolean insertResource(ResourceBo bo);
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DutyEmpServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.Collection;
 public class DutyEmpServiceImpl extends ServicePlusImpl<DutyEmpMapper, DutyEmp, DutyEmpVo> implements IDutyEmpService {
 
     @Override
-    public DutyEmpVo queryById(Long id){
+    public DutyEmpVo queryById(String id){
         return getVoById(id);
     }
 
@@ -76,7 +76,7 @@ public class DutyEmpServiceImpl extends ServicePlusImpl<DutyEmpMapper, DutyEmp,
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DutyReportServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.zhdd.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.exception.ServiceException;
@@ -9,6 +10,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.zhdd.domain.Incident;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -19,6 +21,7 @@ import com.ruoyi.zhdd.domain.DutyReport;
 import com.ruoyi.zhdd.mapper.DutyReportMapper;
 import com.ruoyi.zhdd.service.IDutyReportService;
 
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +37,7 @@ import java.util.Collection;
 public class DutyReportServiceImpl extends ServicePlusImpl<DutyReportMapper, DutyReport, DutyReportVo> implements IDutyReportService {
 
     @Override
-    public DutyReportVo queryById(Long id) {
+    public DutyReportVo queryById(String id) {
         return getVoById(id);
     }
 
@@ -54,7 +57,9 @@ public class DutyReportServiceImpl extends ServicePlusImpl<DutyReportMapper, Dut
         LambdaQueryWrapper<DutyReport> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getReportContent()), DutyReport::getReportContent, bo.getReportContent());
         lqw.eq(bo.getStatus() != null, DutyReport::getStatus, bo.getStatus());
-        lqw.eq(bo.getDutyDate() != null, DutyReport::getDutyDate, bo.getDutyDate());
+        if (params.get("beginTime") != null && params.get("endTime") != null) {
+            lqw.between(DutyReport::getDutyDate, Timestamp.valueOf(Convert.toStr(params.get("beginTime"))+ " 00:00:00"), Timestamp.valueOf(Convert.toStr(params.get("endTime")) + " 23:59:59"));
+        }
         lqw.orderByDesc(DutyReport::getUpdateTime);
         return lqw;
     }
@@ -92,7 +97,7 @@ public class DutyReportServiceImpl extends ServicePlusImpl<DutyReportMapper, Dut
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentProcessServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.Collection;
 public class IncidentProcessServiceImpl extends ServicePlusImpl<IncidentProcessMapper, IncidentProcess, IncidentProcessVo> implements IIncidentProcessService {
 
     @Override
-    public IncidentProcessVo queryById(Long id){
+    public IncidentProcessVo queryById(String id){
         return getVoById(id);
     }
 
@@ -76,7 +76,7 @@ public class IncidentProcessServiceImpl extends ServicePlusImpl<IncidentProcessM
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentServiceImpl.java

@@ -52,7 +52,7 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
     private IIncidentTaskService incidentTaskService;
 
     @Override
-    public IncidentVo queryById(Long id){
+    public IncidentVo queryById(String id){
         return getVoById(id);
     }
 
@@ -150,7 +150,7 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentTaskPersonServiceImpl.java

@@ -0,0 +1,86 @@
+package com.ruoyi.zhdd.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zhdd.domain.bo.IncidentTaskPersonBo;
+import com.ruoyi.zhdd.domain.vo.IncidentTaskPersonVo;
+import com.ruoyi.zhdd.domain.IncidentTaskPerson;
+import com.ruoyi.zhdd.mapper.IncidentTaskPersonMapper;
+import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 事件处置方案人员Service业务层处理
+ *
+ * @author xintong
+ * @date 2021-11-27
+ */
+@Service
+public class IncidentTaskPersonServiceImpl extends ServicePlusImpl<IncidentTaskPersonMapper, IncidentTaskPerson, IncidentTaskPersonVo> implements IIncidentTaskPersonService {
+
+    @Override
+    public IncidentTaskPersonVo queryById(String id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<IncidentTaskPersonVo> queryPageList(IncidentTaskPersonBo bo) {
+        PagePlus<IncidentTaskPerson, IncidentTaskPersonVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<IncidentTaskPersonVo> queryList(IncidentTaskPersonBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<IncidentTaskPerson> buildQueryWrapper(IncidentTaskPersonBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<IncidentTaskPerson> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getIncidentId()), IncidentTaskPerson::getIncidentId, bo.getIncidentId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPosition()), IncidentTaskPerson::getPosition, bo.getPosition());
+        lqw.eq(StringUtils.isNotBlank(bo.getPerson()), IncidentTaskPerson::getPerson, bo.getPerson());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(IncidentTaskPersonBo bo) {
+        IncidentTaskPerson add = BeanUtil.toBean(bo, IncidentTaskPerson.class);
+        validEntityBeforeSave(add);
+        return save(add);
+    }
+
+    @Override
+    public Boolean updateByBo(IncidentTaskPersonBo bo) {
+        IncidentTaskPerson update = BeanUtil.toBean(bo, IncidentTaskPerson.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(IncidentTaskPerson entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentTaskServiceImpl.java

@@ -8,11 +8,16 @@ import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.zhdd.domain.IncidentTask;
+import com.ruoyi.zhdd.domain.IncidentTaskPerson;
 import com.ruoyi.zhdd.domain.bo.IncidentTaskBo;
+import com.ruoyi.zhdd.domain.bo.IncidentTasksBo;
 import com.ruoyi.zhdd.domain.vo.IncidentTaskVo;
 import com.ruoyi.zhdd.mapper.IncidentTaskMapper;
+import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
 import com.ruoyi.zhdd.service.IIncidentTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,8 +32,11 @@ import java.util.Map;
 @Service
 public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper, IncidentTask, IncidentTaskVo> implements IIncidentTaskService {
 
+    @Autowired
+    private IIncidentTaskPersonService incidentTaskPersonService;
+
     @Override
-    public IncidentTaskVo queryById(Long id){
+    public IncidentTaskVo queryById(String id){
         return getVoById(id);
     }
 
@@ -51,10 +59,21 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
     }
 
     @Override
-    public Boolean insertByBo(IncidentTaskBo bo) {
-        IncidentTask add = BeanUtil.toBean(bo, IncidentTask.class);
-        validEntityBeforeSave(add);
-        return save(add);
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(IncidentTasksBo bo) {
+        // 新增之前情况内容
+        remove(Wrappers.<IncidentTask>lambdaQuery().eq(IncidentTask::getIncidentId, bo.getIncidentId()));
+        incidentTaskPersonService.remove(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentId, bo.getIncidentId()));
+        for (IncidentTask incidentTask : bo.getIncidentTasks()) {
+            incidentTask.setIncidentId(bo.getIncidentId());
+            incidentTask.setSource(2);
+        }
+        for (IncidentTaskPerson incidentTaskPeople : bo.getIncidentTaskPeoples()) {
+            incidentTaskPeople.setIncidentId(bo.getIncidentId());
+        }
+        saveAll(bo.getIncidentTasks());
+        incidentTaskPersonService.saveAll(bo.getIncidentTaskPeoples());
+        return true;
     }
 
     @Override
@@ -74,7 +93,7 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/PlanFileServiceImpl.java

@@ -34,7 +34,7 @@ import java.util.Map;
 public class PlanFileServiceImpl extends ServicePlusImpl<PlanFileMapper, PlanFile, PlanFileVo> implements IPlanFileService {
 
     @Override
-    public PlanFileVo queryById(Long id){
+    public PlanFileVo queryById(String id){
         return getVoById(id);
     }
 
@@ -82,7 +82,7 @@ public class PlanFileServiceImpl extends ServicePlusImpl<PlanFileMapper, PlanFil
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/PlanServiceImpl.java

@@ -47,7 +47,7 @@ public class PlanServiceImpl extends ServicePlusImpl<PlanMapper, Plan, PlanVo> i
     private IPlanFileService planFileService;
 
     @Override
-    public PlanVo queryById(Long id){
+    public PlanVo queryById(String id){
         PlanVo voById = getVoById(id);
         // 查询预案的任务
         PlanTaskBo planTaskBo = new PlanTaskBo();
@@ -106,7 +106,7 @@ public class PlanServiceImpl extends ServicePlusImpl<PlanMapper, Plan, PlanVo> i
         Plan add = BeanUtil.toBean(bo, Plan.class);
         validEntityBeforeSave(add);
         save(add);
-        Long planId = add.getId();
+        String planId = add.getId();
         // 处理预案内容数据
         for (PlanTask planTask : bo.getPlanTasks()) {
             planTask.setPlanId(planId);
@@ -126,7 +126,7 @@ public class PlanServiceImpl extends ServicePlusImpl<PlanMapper, Plan, PlanVo> i
         Plan update = BeanUtil.toBean(bo, Plan.class);
         validEntityBeforeSave(update);
         updateById(update);
-        Long planId = update.getId();
+        String planId = update.getId();
         // 处理预案内容数据,更新之前先删除
         planTaskService.remove(Wrappers.<PlanTask>lambdaQuery().eq(PlanTask::getPlanId, planId));
         for (PlanTask planTask : bo.getPlanTasks()) {
@@ -153,7 +153,7 @@ public class PlanServiceImpl extends ServicePlusImpl<PlanMapper, Plan, PlanVo> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/PlanTaskServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 public class PlanTaskServiceImpl extends ServicePlusImpl<PlanTaskMapper, PlanTask, PlanTaskVo> implements IPlanTaskService {
 
     @Override
-    public PlanTaskVo queryById(Long id){
+    public PlanTaskVo queryById(String id){
         return getVoById(id);
     }
 
@@ -69,7 +69,7 @@ public class PlanTaskServiceImpl extends ServicePlusImpl<PlanTaskMapper, PlanTas
     }
 
     @Override
-    public Map<Integer, List<PlanTaskVo>> queryPlanTaskByPlanId(Long planId) {
+    public Map<Integer, List<PlanTaskVo>> queryPlanTaskByPlanId(String planId) {
         PlanTaskBo planTaskBo = new PlanTaskBo();
         planTaskBo.setPlanId(planId);
         List<PlanTaskVo> list = queryList(planTaskBo);
@@ -87,7 +87,7 @@ public class PlanTaskServiceImpl extends ServicePlusImpl<PlanTaskMapper, PlanTas
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceDetailServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.Collection;
 public class ResourceDetailServiceImpl extends ServicePlusImpl<ResourceDetailMapper, ResourceDetail, ResourceDetailVo> implements IResourceDetailService {
 
     @Override
-    public ResourceDetailVo queryById(Long id){
+    public ResourceDetailVo queryById(String id){
         return getVoById(id);
     }
 
@@ -80,7 +80,7 @@ public class ResourceDetailServiceImpl extends ServicePlusImpl<ResourceDetailMap
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceServiceImpl.java

@@ -38,7 +38,7 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
     private IResourceDetailService resourceDetailService;
 
     @Override
-    public ResourceVo queryById(Long id){
+    public ResourceVo queryById(String id){
         ResourceVo voById = getVoById(id);
         if (voById.getResourceType() == 1) {
             // 应急仓库的类型查询仓库物资
@@ -100,7 +100,7 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
@@ -117,6 +117,10 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean insertResource(ResourceBo bo) {
+        if (bo.getResourceType() == 3) {
+            // 车牌号转大写
+            bo.setName(bo.getName().toUpperCase());
+        }
         Resource add = BeanUtil.toBean(bo, Resource.class);
         boolean save = save(add);
         if (save) {
@@ -142,6 +146,10 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateResource(ResourceBo bo) {
+        if (bo.getResourceType() == 3) {
+            // 车牌号转大写
+            bo.setName(bo.getName().toUpperCase());
+        }
         Resource update = BeanUtil.toBean(bo, Resource.class);
         boolean save = updateById(update);
         if (save) {
@@ -160,4 +168,5 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
         }
         return save;
     }
+
 }

ruoyi-zhdd/src/main/resources/mapper/zhdd/IncidentTaskPersonMapper.xml

@@ -0,0 +1,17 @@
+<?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.ruoyi.zhdd.mapper.IncidentTaskPersonMapper">
+
+    <resultMap type="com.ruoyi.zhdd.domain.IncidentTaskPerson" id="IncidentTaskPersonResult">
+        <result property="id" column="id"/>
+        <result property="incidentId" column="incident_id"/>
+        <result property="position" column="position"/>
+        <result property="person" column="person"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+    </resultMap>
+
+
+</mapper>

ruoyi-zhdd/src/main/resources/mapper/zhdd/ResourceMapper.xml

@@ -23,5 +23,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-
 </mapper>

sql/20211103修改.sql

@@ -186,3 +186,55 @@ INSERT INTO sys_dict_type (dict_id, dict_name, dict_type, status, create_by, cre
 INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (127, 0, '应急仓库', '1', 'zhdd_resource', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
 INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (128, 0, '应急队伍', '2', 'zhdd_resource', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
 INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (129, 0, '应急车辆', '3', 'zhdd_resource', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+
+INSERT INTO sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (19, '首页类型筛选', 'zhdd_screen_type', '0', 'admin', '2021-09-28 15:55:09', 'admin', '2021-09-28 15:55:09', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (130, 0, '预警事件', '预警事件', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (131, 0, '待派发事件', '待派发事件', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (132, 0, '待处置事件', '待处置事件', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (133, 0, '路况信息', '路况信息', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (134, 0, '视频监控', '视频监控', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (135, 0, '应急车辆', '应急车辆', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (136, 0, '应急队伍', '应急队伍', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (137, 0, '应急仓库', '应急仓库', 'zhdd_screen_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23', null);
+
+alter table b_resource
+    add car_type varchar(20);
+comment on column b_resource.car_type is '车辆类型';
+
+alter table b_duty_emp alter column id type varchar(36) using id::varchar(36);
+alter table b_duty_report alter column id type varchar(36) using id::varchar(36);
+alter table b_incident alter column id type varchar(36) using id::varchar(36);
+alter table b_incident_process alter column id type varchar(36) using id::varchar(36);
+alter table b_incident_task alter column id type varchar(36) using id::varchar(36);
+alter table b_plan alter column id type varchar(36) using id::varchar(36);
+alter table b_plan_file alter column id type varchar(36) using id::varchar(36);
+alter table b_plan_task alter column id type varchar(36) using id::varchar(36);
+alter table b_resource alter column id type varchar(36) using id::varchar(36);
+alter table b_resource_detail alter column id type varchar(36) using id::varchar(36);
+alter table b_incident_process alter column incident_id type varchar(36) using incident_id::varchar(36);
+alter table b_incident_task alter column incident_id type varchar(36) using incident_id::varchar(36);
+alter table b_plan_file alter column plan_id type varchar(36) using plan_id::varchar(36);
+alter table b_plan_task alter column plan_id type varchar(36) using plan_id::varchar(36);
+alter table b_resource_detail alter column resource_id type varchar(36) using resource_id::varchar(36);
+
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time) VALUES (138, 0, '皮卡', '皮卡', 'zhdd_car_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23');
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time) VALUES (139, 0, '轿车', '轿车', 'zhdd_car_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23');
+INSERT INTO sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time) VALUES (140, 0, '越野车', '越野车', 'zhdd_car_type', null, 'default', 'N', '0', 'admin', '2021-09-28 15:57:23', 'admin', '2021-09-28 15:57:23');
+INSERT INTO sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time) VALUES (20, '车辆类型', 'zhdd_car_type', '0', 'admin', '2021-09-28 15:55:09', 'admin', '2021-09-28 15:55:09');
+
+create table b_incident_task_person
+(
+    id varchar(36),
+    incident_id varchar(36),
+    position varchar(20),
+    person varchar(10),
+    create_time timestamp(0),
+    create_by varchar(64)
+);
+comment on table b_incident_task_person is '事件处置方案人员';
+comment on column b_incident_task_person.id is '主键';
+comment on column b_incident_task_person.incident_id is '事件id';
+comment on column b_incident_task_person.position is '人员职位';
+comment on column b_incident_task_person.person is '人员姓名';
+
+