fix

README.md

@@ -105,6 +105,9 @@ test02/12345678
 > 测试环境访问：
 
 http://sqpc.xt.wenhq.top:8083/
+移动端事件处置：http://sqmb.xt.wenhq.top:8083/#/home
+移动端事件上报：http://sqmb.xt.wenhq.top:8083/#/status/undefined/report
+移动端资源管理：http://sqmb.xt.wenhq.top:8083/#/warehouse/detail
 
 > 宿迁windows上传镜像部署
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/NoticeInfoListiner.java

@@ -69,7 +69,9 @@ public class NoticeInfoListiner {
             log.info("订阅事件消息 => {}", msg);
             // 查询事件信息并发送消息
             MessagePushBo messagePushBo = new MessagePushBo();
-            String type = msg.substring(0, 1);
+            // (1-应急处置消息、2-应急处置待办、3-资源管理待办)
+            String messageType = msg.substring(0, 1);
+            String type = msg.substring(1, 2);
             String title = "未知";
             String synopsis = "未知";
             String text = "未知";
@@ -78,17 +80,17 @@ public class NoticeInfoListiner {
             boolean sendFlag = true;
             incidentProcess.setStatus(1);
             if ("A".equals(type)) {
-                IncidentVo incidentVo = incidentService.queryById(msg.substring(1));
+                IncidentVo incidentVo = incidentService.queryById(msg.substring(2));
                 title = StrUtil.concat(true, "应急事件:", incidentVo.getName());
                 synopsis = "请查看应急事件";
                 text = StrUtil.concat(true, incidentVo.getAddr(), "发生应急事件，请关注消息，做好应急准备");
                 incidentProcess.setDes("事件接报");
                 incidentProcess.setIncidentStatus(1);
-                incidentProcess.setIncidentId(msg.substring(1));
+                incidentProcess.setIncidentId(msg.substring(2));
                 messageUser = incidentVo.getExprJson();
             } else if ("B".equals(type)) {
                 // 查询处置方案
-                IncidentTaskVo incidentTaskVo = incidentTaskService.queryById(msg.substring(1));
+                IncidentTaskVo incidentTaskVo = incidentTaskService.queryById(msg.substring(2));
                 log.info("查询的处置方案：{}", incidentTaskVo);
                 IncidentVo incidentVo = incidentService.queryById(incidentTaskVo.getIncidentId());
                 title = "应急处置";

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

@@ -30,19 +30,22 @@ import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.zhdd.domain.Incident;
 import com.ruoyi.zhdd.domain.IncidentProcess;
-import com.ruoyi.zhdd.domain.IncidentTaskCommand;
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
 import com.ruoyi.zhdd.domain.Plan;
 import com.ruoyi.zhdd.domain.PlanFile;
 import com.ruoyi.zhdd.domain.bo.IncidentBo;
 import com.ruoyi.zhdd.domain.bo.IncidentTasksBo;
-import com.ruoyi.zhdd.domain.vo.IncidentTaskCommandVo;
 import com.ruoyi.zhdd.domain.vo.IncidentTaskVo;
 import com.ruoyi.zhdd.domain.vo.IncidentVo;
 import com.ruoyi.zhdd.domain.vo.PlanFileVo;
 import com.ruoyi.zhdd.domain.vo.PlanVo;
 import com.ruoyi.zhdd.feign.FeignNoticeInfoService;
-import com.ruoyi.zhdd.service.*;
+import com.ruoyi.zhdd.service.IIncidentProcessService;
+import com.ruoyi.zhdd.service.IIncidentService;
+import com.ruoyi.zhdd.service.IIncidentTaskService;
+import com.ruoyi.zhdd.service.IPlanFileService;
+import com.ruoyi.zhdd.service.IPlanService;
+import com.ruoyi.zhdd.service.IPlanTaskService;
+import com.ruoyi.zhdd.service.IResourceDetailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -81,29 +84,17 @@ import java.util.stream.Collectors;
 public class IncidentController extends BaseController {
 
     private final IIncidentService iIncidentService;
-
     private final IIncidentTaskService incidentTaskService;
-
-    private final IIncidentTaskPersonService incidentTaskPersonService;
-
-    private final IIncidentTaskCommandService incidentTaskCommandService;
-
+    //    private final IIncidentTaskPersonService incidentTaskPersonService;
+//    private final IIncidentTaskCommandService incidentTaskCommandService;
     private final IIncidentProcessService iIncidentProcessService;
-
     private final IPlanTaskService planTaskService;
-
     private final IPlanService planService;
-
     private final IPlanFileService planFileService;
-
     private final ISysDictDataService sysDictDataService;
-
     private final FeignNoticeInfoService feignNoticeInfoService;
-
     private final IResourceDetailService resourceDetailService;
-
     private final ISysUserService sysUserService;
-
     private final ISysDeptService sysDeptService;
 
     @Value("${spring.profiles.active}")
@@ -123,14 +114,14 @@ public class IncidentController extends BaseController {
     /**
      * 导出事件基础列表
      */
-    @ApiOperation("导出事件基础列表")
+//    @ApiOperation("导出事件基础列表")
 //    @PreAuthorize("@ss.hasPermi('zhdd:incident:export')")
 //    @Log(title = "事件基础", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated IncidentBo bo, HttpServletResponse response) {
-        List<IncidentVo> list = iIncidentService.queryList(bo);
-        ExcelUtil.exportExcel(list, "事件基础", IncidentVo.class, response);
-    }
+//    @GetMapping("/export")
+//    public void export(@Validated IncidentBo bo, HttpServletResponse response) {
+//        List<IncidentVo> list = iIncidentService.queryList(bo);
+//        ExcelUtil.exportExcel(list, "事件基础", IncidentVo.class, response);
+//    }
 
     /**
      * 获取事件基础详细信息
@@ -158,7 +149,7 @@ public class IncidentController extends BaseController {
         }
         map.put("baseInfo", incidentVo);
         // 查询所属预案
-        List<PlanVo> voOne = planService.listVo(Wrappers.<Plan>lambdaQuery().eq(Plan::getType, incidentVo.getType()).eq(Plan::getCreateDept, incidentVo.getCreateDept()));
+        List<PlanVo> voOne = planService.listVo(Wrappers.<Plan>lambdaQuery().eq(Plan::getType, incidentVo.getType()).eq(Plan::getCreateDept, incidentVo.getPlanDept()));
         if (voOne != null && voOne.size() > 0) {
             map.put("baseTask", planTaskService.queryPlanTaskByPlanId(voOne.get(0).getId()));
             // 查询预案附件
@@ -221,7 +212,7 @@ public class IncidentController extends BaseController {
         bo.setStatus(1);
         LoginUser cacheLoginUser = UserUtil.getCacheLoginUser();
         bo.setCreateBy(cacheLoginUser.getUsername());
-        bo.setCreateDept(cacheLoginUser.getUser().getOrgId());
+        bo.setCreateDept(cacheLoginUser.getUser().getDeptId());
         bo.setExpr1(cacheLoginUser.getUser().getPhonenumber());
         return toAjax(iIncidentService.insertByBo(bo) ? 1 : 0);
     }
@@ -312,13 +303,13 @@ public class IncidentController extends BaseController {
                 }
             }
             // 查询方案人员
-            map.put("incidentPerson", incidentTaskPersonService.listVo(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, id)));
+//            map.put("incidentPerson", incidentTaskPersonService.listVo(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, id)));
             // 查询方案指令
-            List<IncidentTaskCommandVo> incidentTaskCommandVos = incidentTaskCommandService.listVo(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, id));
-            for (int i = 0; i < incidentTaskCommandVos.size(); i++) {
-                incidentTaskCommandVos.get(i).setIndex(i + 1);
-            }
-            map.put("incidentCommand", incidentTaskCommandVos);
+//            List<IncidentTaskCommandVo> incidentTaskCommandVos = incidentTaskCommandService.listVo(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, id));
+//            for (int i = 0; i < incidentTaskCommandVos.size(); i++) {
+//                incidentTaskCommandVos.get(i).setIndex(i + 1);
+//            }
+//            map.put("incidentCommand", incidentTaskCommandVos);
             // 查询处置过程
             List<IncidentProcess> incidentProcess = iIncidentProcessService.list(Wrappers.<IncidentProcess>lambdaQuery()
                 .eq(IncidentProcess::getIncidentId, incidentTaskVo.getIncidentId()).orderByDesc(IncidentProcess::getCreateTime));
@@ -347,6 +338,18 @@ public class IncidentController extends BaseController {
         }
     }
 
+    @ApiOperation("复制事件应急方案")
+    @RepeatSubmit()
+    @PostMapping("/copyTask")
+    public AjaxResult<Void> copyTask(@RequestBody JSONObject jsonObject) {
+        String oldId = jsonObject.getStr("oldIncidentId");
+        String newId = jsonObject.getStr("newIncidentId");
+        if (StrUtil.hasBlank(oldId, newId)) {
+            return AjaxResult.error("参数存在空值！");
+        }
+        return toAjax(incidentTaskService.copyTask(oldId, newId) ? 1 : 0);
+    }
+
     /**
      * 删除零时生成的文件
      */

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

@@ -6,6 +6,7 @@ import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Security;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.GatewayUser;
@@ -67,6 +68,7 @@ public class ResourceController extends BaseController {
     @ApiOperation("查询应急资源列表")
 //    @PreAuthorize("@ss.hasPermi('zhdd:resource:list')")
     @GetMapping("/list")
+    @Security
     public TableDataInfo<ResourceVo> list(@Validated(QueryGroup.class) ResourceBo bo) {
         if (bo.getResourceType() != null && bo.getResourceType() == 1 && StrUtil.isNotBlank(bo.getGoodsName())) {
             // 模糊查询有哪些仓库存在此物资
@@ -125,6 +127,7 @@ public class ResourceController extends BaseController {
     @Log(title = "应急资源", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
+    @Security
     public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody ResourceBo bo) {
 //        // 临时增加处理只能看到该部门的数据
 //        GatewayUser user = getGateWayUser();
@@ -142,6 +145,7 @@ public class ResourceController extends BaseController {
     @Log(title = "应急资源", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
+    @Security
     public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody ResourceBo bo) {
         return toAjax(iResourceService.updateResource(bo) ? 1 : 0);
     }
@@ -153,6 +157,7 @@ public class ResourceController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('zhdd:resource:remove')")
     @Log(title = "应急资源", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
+    @Security
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
                                    @PathVariable String[] ids) {
         return toAjax(iResourceService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);

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

@@ -1,13 +1,17 @@
 package com.ruoyi.zhdd.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
-import java.math.BigDecimal;
 
 /**
  * 事件基础对象 b_incident
@@ -21,7 +25,7 @@ import java.math.BigDecimal;
 @TableName("b_incident")
 public class Incident implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
 
     /**
@@ -55,6 +59,8 @@ public class Incident implements Serializable {
      */
     private String createDept;
 
+    private String planDept;
+
     /**
      * 归档总结
      */

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

@@ -41,6 +41,8 @@ public class IncidentTask implements Serializable {
 
     private String taskName;
 
+    private String sendFlag;
+
     @TableLogic
     private String delFlag;
 

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

@@ -62,6 +62,9 @@ public class IncidentBo extends BaseEntity {
     @ApiModelProperty(value = "上报部门")
     private String createDept;
 
+    @ApiModelProperty(value = "预案来源部门")
+    private String planDept;
+
     /**
      * $column.columnComment
      */
@@ -171,4 +174,7 @@ public class IncidentBo extends BaseEntity {
 
     @ApiModelProperty("消息发送的人")
     private List<MessagePushUser> messagePushUsers;
+
+    @ApiModelProperty("查询来源")
+    private String querySource = "pc";
 }

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

@@ -1,8 +1,6 @@
 package com.ruoyi.zhdd.domain.bo;
 
 import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.zhdd.domain.IncidentTaskCommand;
-import com.ruoyi.zhdd.domain.IncidentTaskPerson;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,10 +21,10 @@ public class IncidentTasksBo {
     private String incidentId;
     @NotBlank(message = "taskName不能为空", groups = {AddGroup.class})
     private String taskName;
-    private List<IncidentTaskCommand> incidentTaskCommands;
-    private List<IncidentTaskPerson> incidentTaskPeoples;
-    @ApiModelProperty("消息是否发送")
-    private boolean sendFlag = false;
+    //    private List<IncidentTaskCommand> incidentTaskCommands;
+//    private List<IncidentTaskPerson> incidentTaskPeoples;
+    @ApiModelProperty("消息类型.1-应急处置消息、2-应急处置待办、3-资源管理待办")
+    private String sendFlag = "1";
     @ApiModelProperty("消息发送的人")
     private List<MessagePushUser> messagePushUsers;
 }

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

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -37,9 +36,11 @@ public class IncidentTaskVo {
     @ApiModelProperty(value = "任务名称")
     private String taskName;
 
-    private List<IncidentTaskCommandVo> taskCommandVos;
+//    private List<IncidentTaskCommandVo> taskCommandVos;
 
-    private List<IncidentTaskPersonVo> taskPersonVos;
+//    private List<IncidentTaskPersonVo> taskPersonVos;
+
+    private String sendFlag;
 
     @Excel(name = "创建人")
     @ApiModelProperty("创建人")

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

@@ -61,6 +61,9 @@ public class IncidentVo {
     @ApiModelProperty("上报部门")
     private String createDept;
 
+    @ApiModelProperty(value = "预案来源部门")
+    private String planDept;
+
     /**
      * 事件来源
      */

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

@@ -2,12 +2,9 @@ package com.ruoyi.zhdd.service;
 
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
-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;
 
 import java.util.Collection;
@@ -20,43 +17,49 @@ import java.util.List;
  * @date 2021-09-28
  */
 public interface IIncidentTaskService extends IServicePlus<IncidentTask, IncidentTaskVo> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	IncidentTaskVo queryById(String id);
-
-	/**
-	 * 查询列表
-	 */
+    /**
+     * 查询单个
+     *
+     * @return
+     */
+    IncidentTaskVo queryById(String id);
+
+    /**
+     * 查询列表
+     */
     TableDataInfo<IncidentTaskVo> queryPageList(IncidentTaskBo bo);
 
-	/**
-	 * 查询列表
-	 */
-	List<IncidentTaskVo> queryList(IncidentTaskBo bo);
-
-	/**
-	 * 根据新增业务对象插入事件处置流程
-	 * @param bo 事件处置流程新增业务对象
-	 * @return
-	 */
-	Boolean insertByBo(IncidentTasksBo bo);
-
-	/**
-	 * 根据编辑业务对象修改事件处置流程
-	 * @param bo 事件处置流程编辑业务对象
-	 * @return
-	 */
-	Boolean updateByBo(IncidentTaskBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+    /**
+     * 查询列表
+     */
+    List<IncidentTaskVo> queryList(IncidentTaskBo bo);
+
+    /**
+     * 根据新增业务对象插入事件处置流程
+     *
+     * @param bo 事件处置流程新增业务对象
+     * @return
+     */
+    Boolean insertByBo(IncidentTasksBo bo);
+
+    /**
+     * 根据编辑业务对象修改事件处置流程
+     *
+     * @param bo 事件处置流程编辑业务对象
+     * @return
+     */
+    Boolean updateByBo(IncidentTaskBo bo);
+
+    /**
+     * 校验并删除数据
+     *
+     * @param ids     主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     List<IncidentTaskVo> listTaskInfo(String id);
+
+    boolean copyTask(String oldId, String newId);
 }

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

@@ -13,18 +13,12 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.zhdd.domain.IncidentTask;
-import com.ruoyi.zhdd.domain.IncidentTaskCommand;
-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.IIncidentProcessService;
-import com.ruoyi.zhdd.service.IIncidentTaskCommandService;
-import com.ruoyi.zhdd.service.IIncidentTaskPersonService;
 import com.ruoyi.zhdd.service.IIncidentTaskService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -42,12 +36,12 @@ import java.util.Map;
 @Slf4j
 public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper, IncidentTask, IncidentTaskVo> implements IIncidentTaskService {
 
-    @Autowired
-    private IIncidentTaskPersonService incidentTaskPersonService;
-    @Autowired
-    private IIncidentTaskCommandService incidentTaskCommandService;
-    @Autowired
-    private IIncidentProcessService incidentProcessService;
+//    @Autowired
+//    private IIncidentTaskPersonService incidentTaskPersonService;
+//    @Autowired
+//    private IIncidentTaskCommandService incidentTaskCommandService;
+//    @Autowired
+//    private IIncidentProcessService incidentProcessService;
 
     @Override
     public IncidentTaskVo queryById(String id) {
@@ -76,18 +70,18 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(IncidentTasksBo bo) {
         // 新增之前删除之前的内容
-        String insertOrUpdateFlag = "新增";
+//        String insertOrUpdateFlag = "新增";
         if (StrUtil.isNotBlank(bo.getId())) {
             removeById(bo.getId());
-            incidentTaskPersonService.remove(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, bo.getId()));
-            incidentTaskCommandService.remove(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, bo.getId()));
-            insertOrUpdateFlag = "编辑";
+//            incidentTaskPersonService.remove(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, bo.getId()));
+//            incidentTaskCommandService.remove(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, bo.getId()));
+//            insertOrUpdateFlag = "编辑";
         }
         IncidentTask add = BeanUtil.toBean(bo, IncidentTask.class);
         add.setId(null);
         add.setExprJson(JSONUtil.toJsonStr(bo.getMessagePushUsers()));
         save(add);
-        // 新增指令和人员
+        /*// 新增指令和人员
         if (bo.getIncidentTaskCommands() != null) {
             for (IncidentTaskCommand incidentTaskCommand : bo.getIncidentTaskCommands()) {
                 incidentTaskCommand.setId(null);
@@ -101,14 +95,15 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
             }
         }
         incidentTaskCommandService.saveAll(bo.getIncidentTaskCommands());
-        incidentTaskPersonService.saveAll(bo.getIncidentTaskPeoples());
-        // 发送消息
-        if (bo.isSendFlag()) {
-            // A:事件接报。B:处置方案
-            RedisUtils.publish(Constants.NOTICE_PUSH, "B" + add.getId(), msg -> {
-                log.info("发布应急方案消息 => " + msg);
-            });
-        } else {
+        incidentTaskPersonService.saveAll(bo.getIncidentTaskPeoples());*/
+        // 发送消息(1-应急处置消息、2-应急处置待办、3-资源管理待办)
+//        if (bo.isSendFlag()) {
+        // A:事件接报。B:处置方案
+        RedisUtils.publish(Constants.NOTICE_PUSH, bo.getSendFlag() + "B" + add.getId(), msg -> {
+            log.info("发布应急方案消息 => " + msg);
+        });
+//        }
+        /*else {
             JSONObject jsonObject = new JSONObject();
             jsonObject.set("des", insertOrUpdateFlag + "处置方案：" + bo.getTaskName());
             jsonObject.set("incidentId", bo.getIncidentId());
@@ -116,7 +111,7 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
             RedisUtils.publish(Constants.PROCESS_RECORD, jsonObject, msg -> {
                 log.info("事件处置方案新增消息 => " + msg);
             });
-        }
+        }*/
         return true;
     }
 
@@ -130,17 +125,30 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
     @Override
     public List<IncidentTaskVo> listTaskInfo(String id) {
         List<IncidentTaskVo> incidentTaskVo = listVo(Wrappers.<IncidentTask>lambdaQuery().eq(IncidentTask::getIncidentId, id).orderByAsc(IncidentTask::getCreateTime));
-        if (incidentTaskVo != null) {
-            // 查询指令和人员
-            for (IncidentTaskVo taskVo : incidentTaskVo) {
-                taskVo.setTaskCommandVos(incidentTaskCommandService.listVo(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, taskVo.getId())));
-                taskVo.setTaskPersonVos(incidentTaskPersonService.listVo(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, taskVo.getId())));
-            }
-        }
+//        if (incidentTaskVo != null) {
+//            // 查询指令和人员
+//            for (IncidentTaskVo taskVo : incidentTaskVo) {
+//                taskVo.setTaskCommandVos(incidentTaskCommandService.listVo(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, taskVo.getId())));
+//                taskVo.setTaskPersonVos(incidentTaskPersonService.listVo(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, taskVo.getId())));
+//            }
+//        }
         return incidentTaskVo;
     }
 
     /**
+     * 复制旧的方案到新事件中
+     *
+     * @param oldId
+     * @param newId
+     * @return
+     */
+    @Override
+    public boolean copyTask(String oldId, String newId) {
+
+        return false;
+    }
+
+    /**
      * 保存前的数据校验
      *
      * @param entity 实体类数据

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

@@ -8,6 +8,7 @@
         <result property="id" column="id"/>
         <result property="incidentId" column="incident_id"/>
         <result property="taskName" column="task_name"/>
+        <result property="sendFlag" column="send_flag"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="exprJson" column="expr_json"/>

ry.bat

@@ -1,67 +0,0 @@
-@echo off
-
-rem jar平级目录
-set AppName=ruoyi-admin.jar
-
-rem JVM参数
-set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
-
-
-ECHO. 
-	ECHO.  [1] 启动%AppName%
-	ECHO.  [2] 关闭%AppName%
-	ECHO.  [3] 重启%AppName%
-	ECHO.  [4] 启动状态 %AppName%
-	ECHO.  [5] 退 出 
-ECHO. 
-
-ECHO.请输入选择项目的序号:
-set /p ID=
-	IF "%id%"=="1" GOTO start 
-	IF "%id%"=="2" GOTO stop 
-	IF "%id%"=="3" GOTO restart 
-	IF "%id%"=="4" GOTO status
-	IF "%id%"=="5" EXIT
-PAUSE 
-:start
-    for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
-		set pid=%%a
-		set image_name=%%b
-	)
-	if  defined pid (
-		echo %%is running 
-		PAUSE 
-	) 
-
-start javaw -jar %JAVA_OPTS% ruoyi-admin.jar
-
-echo  starting……
-echo  Start %AppName% success...
-goto:eof
-
-rem 函数stop通过jps命令查找pid并结束进程
-:stop
-	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
-		set pid=%%a
-		set image_name=%%b
-	)
-	if not defined pid (echo process %AppName% does not exists) else (
-		echo prepare to kill %image_name%
-		echo start kill %pid% ...
-		rem 根据进程ID，kill进程
-		taskkill /f /pid %pid%
-	)
-goto:eof
-:restart
-	call :stop
-    call :start
-goto:eof
-:status
-	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
-		set pid=%%a
-		set image_name=%%b
-	)
-	if not defined pid (echo process %AppName% is dead ) else (
-		echo %image_name% is running
-	)
-goto:eof

ry.sh

@@ -1,90 +0,0 @@
-#!/bin/sh
-# author ruoyi
-# ./ry.sh start 启动
-# ./ry.sh stop 停止
-# ./ry.sh restart 重启
-# ./ry.sh status 状态
-AppName=ruoyi-admin.jar
-
-# JVM参数
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
-APP_HOME=`pwd`
-LOG_PATH=$APP_HOME/logs/$AppName.log
-
-if [ "$1" = "" ];
-then
-    echo -e "\033[0;31m 未输入操作名 \033[0m  \033[0;34m {start|stop|restart|status} \033[0m"
-    exit 1
-fi
-
-if [ "$AppName" = "" ];
-then
-    echo -e "\033[0;31m 未输入应用名 \033[0m"
-    exit 1
-fi
-
-function start()
-{
-    PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
-
-	if [ x"$PID" != x"" ]; then
-	    echo "$AppName is running..."
-	else
-		nohup java -jar  $JVM_OPTS target/$AppName > /dev/null 2>&1 &
-		echo "Start $AppName success..."
-	fi
-}
-
-function stop()
-{
-    echo "Stop $AppName"
-
-	PID=""
-	query(){
-		PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
-	}
-
-	query
-	if [ x"$PID" != x"" ]; then
-		kill -TERM $PID
-		echo "$AppName (pid:$PID) exiting..."
-		while [ x"$PID" != x"" ]
-		do
-			sleep 1
-			query
-		done
-		echo "$AppName exited."
-	else
-		echo "$AppName already stopped."
-	fi
-}
-
-function restart()
-{
-    stop
-    sleep 2
-    start
-}
-
-function status()
-{
-    PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
-    if [ $PID != 0 ];then
-        echo "$AppName is running..."
-    else
-        echo "$AppName is not running..."
-    fi
-}
-
-case $1 in
-    start)
-    start;;
-    stop)
-    stop;;
-    restart)
-    restart;;
-    status)
-    status;;
-    *)
-
-esac

sql/20211209修改.sql

@@ -190,8 +190,17 @@ alter table sys_role_menu alter column role_id type varchar(36) using role_id::v
 
 alter table sys_role_menu alter column menu_id type varchar(36) using menu_id::varchar(36);
 
--- 以上已同步
+alter table b_incident_task
+    add "send_flag" varchar(10);
+
+comment
+on column b_incident_task."send_flag" is '消息发送类型';
+
+update b_incident_task
+set send_flag = 1
+where 1 = 1;
 
+-- 以上已同步