添加预案信息相关接口

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/ContingencyInstanceInfo.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+
+@Data
+@Accessors(chain = true)
+@TableName("contingency_instance_info")
+@ApiModel(value = "应急预案执行记录实例", description = "应急预案执行记录实例")
+public class ContingencyInstanceInfo extends Model<ContingencyInstanceInfo>{
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.ID_WORKER_STR)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String id;
+
+    private String name;
+
+    private String position;
+
+    private String equipmentCode;
+
+    private String equipmentName;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private Boolean isDelete = false;
+
+    private Date createDate;
+
+    private String orgCode;
+
+
+
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

@@ -3,11 +3,15 @@ package com.yeejoin.amos.fas.business.controller;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.business.vo.PlanStepVo;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
 import com.yeejoin.amos.fas.core.util.ResponseModel;
+import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
 import com.yeejoin.amos.fas.dao.entity.TextPlan;
+import com.yeejoin.amos.fas.exception.YeeException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -190,4 +194,43 @@ public class PlanVisual3dController extends BaseController {
         }
         return CommonResponseUtil.successNew(planVisual3dService.getPlaneRecordOneByBatchNo(newestBatchNo));
     }
+
+    @Permission
+    @ApiOperation(value = "处置详情信息", notes = "处置详情信息")
+    @GetMapping(value = "/plan/selectDisposalDetails")
+    public ResponseModel selectDisposalDetails(@RequestParam("disposalId") String disposalId) {
+        return CommonResponseUtil.successNew(planVisual3dService.selectDisposalDetails(disposalId));
+    }
+
+
+    @Permission
+    @ApiOperation(httpMethod = "GET", value = "分页查询处置详情信息", notes = "分页查询处置详情信息")
+    @GetMapping(value = "/plan/selectDisposalListPage")
+    public ResponseModel selectDisposalListPage(@RequestParam(value = "current") int current,
+                                                @RequestParam(value = "size") int size
+    ) {
+        if (current < 1 || size < 1) {
+            throw new YeeException("分页参数有误");
+        }
+        ReginParams reginParams = getSelectedOrgInfo();
+        String orgCode = getOrgCode(reginParams);
+        return CommonResponseUtil2.success(planVisual3dService.selectDisposalListPage(current, size, orgCode));
+    }
+
+    @Permission
+    @ApiOperation(value = "新增处置信息", notes = "新增处置信息")
+    @PostMapping(value = "/plan/addDisposalDetails")
+    public ResponseModel addDisposalDetails(@RequestBody ContingencyInstanceInfo contingencyInstanceInfo) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String orgCode = getOrgCode(reginParams);
+        contingencyInstanceInfo.setOrgCode(orgCode);
+        return CommonResponseUtil.successNew(planVisual3dService.addDisposalDetails(contingencyInstanceInfo));
+    }
+
+    @Permission
+    @ApiOperation(value = "修改处置信息", notes = "修改处置信息")
+    @PostMapping(value = "/plan/updateDisposalDetails")
+    public ResponseModel updateDisposalDetails(@RequestBody ContingencyInstanceInfo contingencyInstanceInfo) {
+        return CommonResponseUtil.successNew(planVisual3dService.updateDisposalDetails(contingencyInstanceInfo));
+    }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ContingencyInstanceInfoMapper.java

+package com.yeejoin.amos.fas.business.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface ContingencyInstanceInfoMapper extends BaseMapper<ContingencyInstanceInfo> {
+
+    ContingencyInstanceInfo selectDisposalDetails(@Param("id") String id);
+
+    Boolean addDisposalDetails(@Param("dto") ContingencyInstanceInfo contingencyInstanceInfo);
+
+    Boolean updateDisposalDetails(@Param("dto") ContingencyInstanceInfo contingencyInstanceInfo);
+
+    int selectCount(@Param("orgCode") String orgCode);
+
+    List<ContingencyInstanceInfo> selectDisposalListPage(@Param("current") int current, @Param("size") int size, @Param("orgCode") String orgCode);
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PollPointMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.dao.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import com.yeejoin.amos.fas.business.vo.PollPointVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -2,11 +2,14 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
+import com.yeejoin.amos.fas.business.dao.mapper.ContingencyInstanceInfoMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.DictMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanOperationRecordMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.PlanVisual3dMapper;
+
 import com.yeejoin.amos.fas.business.dao.repository.*;
 import com.yeejoin.amos.fas.business.feign.IMaasVisualServer;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
@@ -14,10 +17,12 @@ import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 import com.yeejoin.amos.fas.business.util.JSONUtil;
 import com.yeejoin.amos.fas.business.util.StringUtil;
+import com.yeejoin.amos.fas.business.vo.PlanDetailVo;
 import com.yeejoin.amos.fas.business.vo.PlanStepVo;
 import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.DateUtil;
 import com.yeejoin.amos.fas.dao.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -62,6 +68,10 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     @Autowired
     private IPlanOperationRecordDao planOperationRecordDao;
 
+    @Autowired
+    private ContingencyInstanceInfoMapper contingencyInstanceInfoMapper;
+
+
     @Override
     public List<TreeSubjectVo> getPlanTree() {
 
@@ -329,4 +339,40 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         }
         return planStepVo;
     }
+
+    @Override
+    public ContingencyInstanceInfo selectDisposalDetails(String disposalId) {
+        return contingencyInstanceInfoMapper.selectDisposalDetails(disposalId);
+    }
+
+    @Override
+    public Page<ContingencyInstanceInfo> selectDisposalListPage(int current, int size, String orgCode) {
+        Page<ContingencyInstanceInfo> page = new Page<>();
+        int total = contingencyInstanceInfoMapper.selectCount(orgCode);
+        page.setTotal(total);
+        long start = (page.getCurrent() - 1) * page.getSize();
+        if (total == 0) {
+            page.setCurrent(1);
+        } else {
+            if (total < start) {
+                page.setCurrent(1);
+                start = 0;
+            }
+            List<ContingencyInstanceInfo> infoList = contingencyInstanceInfoMapper.selectDisposalListPage((int) start, size, orgCode);
+            page.setRecords(infoList);
+        }
+        return page;
+    }
+
+    @Override
+    public Boolean addDisposalDetails(ContingencyInstanceInfo contingencyInstanceInfo) {
+        contingencyInstanceInfo.setIsDelete(false);
+        contingencyInstanceInfo.setCreateDate(DateUtil.getDateNow());
+        return contingencyInstanceInfoMapper.addDisposalDetails(contingencyInstanceInfo);
+    }
+
+    @Override
+    public Boolean updateDisposalDetails(ContingencyInstanceInfo contingencyInstanceInfo) {
+        return contingencyInstanceInfoMapper.updateDisposalDetails(contingencyInstanceInfo);
+    }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IPlanVisual3dService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 import com.yeejoin.amos.fas.business.vo.PlanStepVo;
 import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
+import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
 import com.yeejoin.amos.fas.dao.entity.PlanRule;
 import com.yeejoin.amos.fas.dao.entity.TextPlan;
 
@@ -72,4 +76,12 @@ public interface IPlanVisual3dService {
     ToipResponse getPlaneRecordOneByBatchNo(String batchNo);
 
     PlanStepVo updatePlanStep(PlanStepVo planStepVo);
+
+    ContingencyInstanceInfo selectDisposalDetails(String disposalId);
+
+    Page<ContingencyInstanceInfo> selectDisposalListPage(int current, int size, String orgCode);
+
+    Boolean addDisposalDetails(ContingencyInstanceInfo contingencyInstanceInfo);
+
+    Boolean updateDisposalDetails(ContingencyInstanceInfo contingencyInstanceInfo);
 }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/ContingencyInstanceInfoMapper.xml

+<?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.yeejoin.amos.fas.business.dao.mapper.ContingencyInstanceInfoMapper">
+    <insert id="addDisposalDetails">
+       INSERT INTO `contingency_instance_info` ( `id`, `name`, `position`, `equipment_code`
+       , `equipment_name`, `start_time`, `end_time`, `org_code`, `is_delete`, `create_date` )
+     VALUES
+	( #{dto.id}, #{dto.name}, #{dto.position}, #{dto.equipmentCode}
+	, #{dto.equipmentName}, #{dto.startTime}, #{dto.endTime},  #{dto.orgCode}
+	, #{dto.isDelete},  #{dto.createDate});
+    </insert>
+
+    <update id="updateDisposalDetails">
+    UPDATE `contingency_instance_info`
+    SET `name` = #{dto.name}, `position` = #{dto.position}
+    , `equipment_code` = #{dto.equipmentCode}, `equipment_name` = #{dto.equipmentName}
+    , `start_time` = #{dto.startTime}, `end_time` = #{dto.endTime}
+    WHERE `id` = #{dto.id};
+
+    </update>
+
+    <select id="selectDisposalDetails" resultType="com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo">
+        select * from contingency_instance_info where  id=#{id}
+    </select>
+
+    <select id="selectDisposalListPage" resultType="com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo">
+        select * from contingency_instance_info where  is_delete = 0
+        and org_code = #{orgCode}
+        ORDER BY create_date DESC
+         LIMIT #{current}, #{size}
+    </select>
+    <select id="selectCount" resultType="java.lang.Integer">
+         select count(1) from contingency_instance_info
+         where  is_delete = 0 and org_code = #{orgCode}
+    </select>
+</mapper>
+