添加vo

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

 package com.yeejoin.amos.fas.dao.entity;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.EqualsAndHashCode;
@@ -78,16 +79,6 @@ public class ContingencyPlanInstance extends BusinessEntity{
     @Column(name = "person_img")
     private String personImg;
 
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getPersonImg() {
         return personImg;
     }

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.business.vo.ContingencyPlanInstanceVO;
 import com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
@@ -22,10 +23,10 @@ public interface ContingencyInstanceInfoMapper extends BaseMapper<ContingencyIns
 
     List<ContingencyInstanceInfo> selectDisposalListPage(@Param("current") int current, @Param("size") int size, @Param("orgCode") String orgCode);
 
-    List<ContingencyPlanInstance> selectDisposalActionPage(@Param("current") int current, @Param("size") int size,@Param("type") String type, @Param("status") String status,@Param("list") List<String> roles ,@Param("batchNo") String batchNo);
+    List<ContingencyPlanInstanceVO> selectDisposalActionPage(@Param("current") int current, @Param("size") int size,@Param("type") String type, @Param("status") String status,@Param("list") List<String> roles ,@Param("batchNo") String batchNo);
 
     int selectCountDisposalActionPage(@Param("type") String type, @Param("status") String status,@Param("list") List<String> roles ,@Param("batchNo") String batchNo);
 
-    List<ContingencyPlanInstance> selectDisposalActionList(@Param("type") String type, @Param("status") String status,@Param("list") List<String> roles ,@Param("batchNo") String batchNo);
+    List<ContingencyPlanInstanceVO> selectDisposalActionList(@Param("type") String type, @Param("status") String status, @Param("list") List<String> roles , @Param("batchNo") String batchNo);
 
 }

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

@@ -855,7 +855,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
             if (instanceInfo != null) {
                 map.put("planName", instanceInfo.getName());
                 map.put("batchNo", batchNo);
-                List<ContingencyPlanInstance> list = planVisual3dService.selectDisposalActionList(batchNo, roleModelList, 1);
+                List<ContingencyPlanInstanceVO> list = planVisual3dService.selectDisposalActionList(batchNo, roleModelList, 1);
                 map.put("taskNum", list.size());
             }
         }

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

@@ -17,6 +17,7 @@ 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.ContingencyPlanInstanceVO;
 import com.yeejoin.amos.fas.business.vo.PlanStepJsonVO;
 import com.yeejoin.amos.fas.business.vo.PlanStepVo;
 import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
@@ -435,11 +436,11 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     }
 
     @Override
-    public Page<ContingencyPlanInstance> selectDisposalActionPage(int current, int size, String disposalId, List<RoleModel> roleModelList, int dataType) {
+    public Page<ContingencyPlanInstanceVO> selectDisposalActionPage(int current, int size, String disposalId, List<RoleModel> roleModelList, int dataType) {
         List<String> roles = new ArrayList<>();
         String type = "OPERATE";
         String status = "";
-        Page<ContingencyPlanInstance> page = new Page<>(current, size);
+        Page<ContingencyPlanInstanceVO> page = new Page<>(current, size);
         if ("1".equals(String.valueOf(dataType))) {
             for (RoleModel roleModel : roleModelList) {
                 roles.add(roleModel.getRoleName());
@@ -467,7 +468,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
                 page.setCurrent(1);
                 start = 0;
             }
-            List<ContingencyPlanInstance> list = contingencyInstanceInfoMapper.selectDisposalActionPage((int) start, size, type, status, roles, disposalId);
+            List<ContingencyPlanInstanceVO> list = contingencyInstanceInfoMapper.selectDisposalActionPage((int) start, size, type, status, roles, disposalId);
             page.setRecords(list);
             page.setTotal(total);
         }
@@ -475,7 +476,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     }
 
     @Override
-    public List<ContingencyPlanInstance> selectDisposalActionList(String batchNo, List<RoleModel> roleModelList, int dataType) {
+    public List<ContingencyPlanInstanceVO> selectDisposalActionList(String batchNo, List<RoleModel> roleModelList, int dataType) {
         List<String> roles = new ArrayList<>();
         String type = "OPERATE";
         String status = "";

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.jpush.PushMsgParam;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
+import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
 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;
@@ -84,7 +85,7 @@ public interface IPlanVisual3dService {
 
     PlanStepVo updatePlanStep(PlanStepVo planStepVo);
 
-    Page<ContingencyPlanInstance> selectDisposalActionPage(int current, int size, String batchNo , List<RoleModel> roleModelList, int dataType);
+    Page<ContingencyPlanInstanceVO> selectDisposalActionPage(int current, int size, String batchNo , List<RoleModel> roleModelList, int dataType);
 
     /**
      * 根据批次号获取预案的消息等记录
@@ -95,7 +96,7 @@ public interface IPlanVisual3dService {
 
     ContingencyPlanInstance replyMessage(AgencyUserModel user, ContingencyPlanInstance dto);
 
-    List<ContingencyPlanInstance> selectDisposalActionList(String batchNo , List<RoleModel> roleModelList, int dataType);
+    List<ContingencyPlanInstanceVO> selectDisposalActionList(String batchNo , List<RoleModel> roleModelList, int dataType);
 
     /**
      * 极光推送

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ContingencyInstanceInfoVO.java

+package com.yeejoin.amos.fas.business.vo;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 com.yeejoin.amos.fas.dao.entity.ContingencyInstanceInfo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+
+@Data
+@TableName("contingency_instance_info")
+@ApiModel(value = "应急预案执行记录实例", description = "应急预案执行记录实例")
+public class ContingencyInstanceInfoVO {
+
+
+    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;
+
+    @TableField
+    private String duration;
+
+
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ContingencyPlanInstanceVO.java

+package com.yeejoin.amos.fas.business.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+
+@Data
+@TableName("contingency_plan_instance")
+public class ContingencyPlanInstanceVO  {
+
+
+    protected String id;
+
+    private String recordType;//	记录类型：消息MESSAGE，操作OPERATE ,回复消息REPLYMESSAGE
+
+    private String content	    ;//	记录内容：文本信息或者json数据
+
+    private String category;//一级分类
+
+
+    private String icon	    ;	//图标,url，或者文件名
+    private Integer sort	    ;//	所有节点一起的排序号
+
+    private String sequenceNum	;//	用于显示的序号
+
+    private String batchNo	;//	预案实例编号,暂时无法区分多个火灾，暂时存储报警设备id
+
+    private String tips;
+
+    private Boolean runstate;
+
+    private String filePath; //文件名称
+
+    private String fileType;// 文件类型
+
+    private String roleName; //角色名称
+
+    private String roleCode; //角色编码
+
+    private String startUserName; //人员名称
+
+    private String startUserId; //人员ID
+
+    private String personImg;
+
+    private String loginUserId;
+
+    private String name;
+
+
+}
+

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

@@ -34,7 +34,7 @@
          select count(1) from contingency_instance_info
          where  is_delete = 0 and org_code = #{orgCode}
     </select>
-    <select id="selectDisposalActionPage" resultType="com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance">
+    <select id="selectDisposalActionPage" resultType="com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO">
         select  cpi.id, cpi.`record_type`, cpi.`category`, cpi.`content`, cpi.`icon`, cpi.`sort`, cpi.`sequence_num`
         , cpi.`batch_no`, cpi.`create_date`, cpi.`create_user`, cpi.`update_date`
         , cpi.`update_user`, cpi.`is_delete`, cpi.`tips`, IFNULL(cpi.`runstate`, 0) AS runstate, cpi.`file_path`
@@ -85,7 +85,7 @@
     </where>
 
     </select>
-    <select id="selectDisposalActionList" resultType="com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance">
+    <select id="selectDisposalActionList" resultType="com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO">
         select  cpi.id, cpi.`record_type`, cpi.`category`, cpi.`content`, cpi.`icon`, cpi.`sort`, cpi.`sequence_num`
         , cpi.`batch_no`, cpi.`create_date`, cpi.`create_user`, cpi.`update_date`
         , cpi.`update_user`, cpi.`is_delete`, cpi.`tips`, IFNULL(cpi.`runstate`, 0) AS runstate, cpi.`file_path`