From 99968f83982943669af3829ea6bc3bbe745cada4 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期一, 21 十一月 2022 08:41:48 +0800
Subject: [PATCH] 安全物资和设备管理相关rpc接口

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java |  138 +++++++++++++++++++++++++++++++++------------
 1 files changed, 100 insertions(+), 38 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
index 56dd407..dc9ab22 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
@@ -8,43 +8,78 @@
 import java.util.List;
 
 public class KeypointEquipmentInfoDto implements Serializable {
-    //ID    
+    //ID
     private Long id;
-    //类型/类别外键    
+    //类型/类别外键
     private Long equipmentTypeId;
-    //名称    
+    //类型名称
+    private String equipmentTypeName;
+    //名称
     private String name;
-    //单位部门外键    
+    //单位部门外键
     private Long departmentId;
     //所属部门名称
     private String departmentName;
     //具体位置
     private String position;
-    //负责人姓名    
+    //负责人姓名
     private String leadingPersonName;
-    //联系人/外键    
+    //联系人/外键
     private Long connectPersonId;
-    //录入人/外键    
+    //联系人名称
+    private String connectPersonName;
+
+    public String getConnectPersonName() {
+        return connectPersonName;
+    }
+
+    public void setConnectPersonName(String connectPersonName) {
+        this.connectPersonName = connectPersonName;
+    }
+    //录入人/外键
     private Long inputPersonId;
-    //责任人/外键    
+    //录入人名称
+    private String inputPersonName;
+
+    public String getInputPersonName() {
+        return inputPersonName;
+    }
+
+    public void setInputPersonName(String inputPersonName) {
+        this.inputPersonName = inputPersonName;
+    }
+    //责任人/外键
     private Long responsibilityPersonId;
-    //装置部位分类 1:关键装置 2:重点部位    
-    private Integer partType;
-    //检查周期    
+
+    //责任人名称
+    private String responsibilityPersonName;
+
+    public String getResponsibilityPersonName() {
+        return responsibilityPersonName;
+    }
+
+    public void setResponsibilityPersonName(String responsibilityPersonName) {
+        this.responsibilityPersonName = responsibilityPersonName;
+    }
+    //装置部位分类 1:关键装置 2:重点部位
+    private Byte partType;
+    //检查周期
     private String checkCycle;
-    //应急预案/外键    
+    //应急预案/外键
     private Long emergencePlanId;
-    //主要危险有害因素    
+    //应急预案名称
+    private String emergencePlanName;
+    //主要危险有害因素
     private String dangerousElement;
-    //易导致风险    
+    //易导致风险
     private String toDangerous;
-    //应急处置措施    
+    //应急处置措施
     private String treatment;
-    //现场图片    
+    //现场图片
     private String scenePic;
-        
+
     private Date createTime;
-        
+
     private Date updateTime;
 
     public String getDepartmentName() {
@@ -189,7 +224,7 @@
     public void setId(Long id) {
         this.id = id;
     }
-    //类型/类别外键        
+    //类型/类别外键
     public Long getEquipmentTypeId() {
         return equipmentTypeId;
     }
@@ -197,7 +232,7 @@
     public void setEquipmentTypeId(Long equipmentTypeId) {
         this.equipmentTypeId = equipmentTypeId;
     }
-    //名称        
+    //名称
     public String getName() {
         return name;
     }
@@ -205,7 +240,7 @@
     public void setName(String name) {
         this.name = name;
     }
-    //单位部门外键        
+    //单位部门外键
     public Long getDepartmentId() {
         return departmentId;
     }
@@ -213,7 +248,7 @@
     public void setDepartmentId(Long departmentId) {
         this.departmentId = departmentId;
     }
-    //具体位置        
+    //具体位置
     public String getPosition() {
         return position;
     }
@@ -221,7 +256,7 @@
     public void setPosition(String position) {
         this.position = position;
     }
-    //负责人姓名        
+    //负责人姓名
     public String getLeadingPersonName() {
         return leadingPersonName;
     }
@@ -229,7 +264,7 @@
     public void setLeadingPersonName(String leadingPersonName) {
         this.leadingPersonName = leadingPersonName;
     }
-    //联系人/外键        
+    //联系人/外键
     public Long getConnectPersonId() {
         return connectPersonId;
     }
@@ -237,7 +272,7 @@
     public void setConnectPersonId(Long connectPersonId) {
         this.connectPersonId = connectPersonId;
     }
-    //录入人/外键        
+    //录入人/外键
     public Long getInputPersonId() {
         return inputPersonId;
     }
@@ -245,7 +280,7 @@
     public void setInputPersonId(Long inputPersonId) {
         this.inputPersonId = inputPersonId;
     }
-    //责任人/外键        
+    //责任人/外键
     public Long getResponsibilityPersonId() {
         return responsibilityPersonId;
     }
@@ -253,15 +288,15 @@
     public void setResponsibilityPersonId(Long responsibilityPersonId) {
         this.responsibilityPersonId = responsibilityPersonId;
     }
-    //装置部位分类 1:关键装置 2:重点部位        
-    public Integer getPartType() {
+    //装置部位分类 1:关键装置 2:重点部位
+    public Byte getPartType() {
         return partType;
     }
 
-    public void setPartType(Integer partType) {
+    public void setPartType(Byte partType) {
         this.partType = partType;
     }
-    //检查周期        
+    //检查周期
     public String getCheckCycle() {
         return checkCycle;
     }
@@ -269,7 +304,7 @@
     public void setCheckCycle(String checkCycle) {
         this.checkCycle = checkCycle;
     }
-    //应急预案/外键        
+    //应急预案/外键
     public Long getEmergencePlanId() {
         return emergencePlanId;
     }
@@ -277,7 +312,7 @@
     public void setEmergencePlanId(Long emergencePlanId) {
         this.emergencePlanId = emergencePlanId;
     }
-    //主要危险有害因素        
+    //主要危险有害因素
     public String getDangerousElement() {
         return dangerousElement;
     }
@@ -285,7 +320,7 @@
     public void setDangerousElement(String dangerousElement) {
         this.dangerousElement = dangerousElement;
     }
-    //易导致风险        
+    //易导致风险
     public String getToDangerous() {
         return toDangerous;
     }
@@ -293,7 +328,7 @@
     public void setToDangerous(String toDangerous) {
         this.toDangerous = toDangerous;
     }
-    //应急处置措施        
+    //应急处置措施
     public String getTreatment() {
         return treatment;
     }
@@ -301,7 +336,7 @@
     public void setTreatment(String treatment) {
         this.treatment = treatment;
     }
-    //现场图片        
+    //现场图片
     public String getScenePic() {
         return scenePic;
     }
@@ -309,7 +344,7 @@
     public void setScenePic(String scenePic) {
         this.scenePic = scenePic;
     }
-            
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -317,7 +352,7 @@
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-            
+
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -325,4 +360,31 @@
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-}
\ No newline at end of file
+
+    public String getEquipmentTypeName() {
+        return equipmentTypeName;
+    }
+
+    public void setEquipmentTypeName(String equipmentTypeName) {
+        this.equipmentTypeName = equipmentTypeName;
+    }
+
+    public String getEmergencePlanName() {
+        return emergencePlanName;
+    }
+
+    public void setEmergencePlanName(String emergencePlanName) {
+        this.emergencePlanName = emergencePlanName;
+    }
+    //备注
+    private String memo;
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+}

--
Gitblit v1.9.2