From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 134 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
index 409b5d5..c82dddb 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
@@ -16,8 +16,8 @@
@SuppressWarnings("serial")
@TableName("equipment_info")
public class EquipmentInfo extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -30,7 +30,7 @@
//类型/类别外键
private Long equipmentTypeId;
-
+
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -38,9 +38,9 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
private Integer infoType;
-
+
public Integer getInfoType() {
return infoType;
}
@@ -50,7 +50,7 @@
}
//名称
private String qName;
-
+
public String getQName() {
return qName;
}
@@ -60,7 +60,7 @@
}
//位号
private String positionNum;
-
+
public String getPositionNum() {
return positionNum;
}
@@ -70,7 +70,7 @@
}
//用途
private String qUsage;
-
+
public String getQUsage() {
return qUsage;
}
@@ -80,7 +80,7 @@
}
//型号
private String model;
-
+
public String getModel() {
return model;
}
@@ -90,7 +90,7 @@
}
//单位部门外键
private Long departmentId;
-
+
public Long getDepartmentId() {
return departmentId;
}
@@ -100,7 +100,7 @@
}
//设置部位
private String setPart;
-
+
public String getSetPart() {
return setPart;
}
@@ -111,7 +111,7 @@
//生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp produceTime;
-
+
public Timestamp getProduceTime() {
return produceTime;
}
@@ -121,7 +121,7 @@
}
//使用期限(天)
private String useEndDay;
-
+
public String getUseEndDay() {
return useEndDay;
}
@@ -130,19 +130,19 @@
this.useEndDay = useEndDay;
}
//生命周期 1：已使用 2：库存中 3：报废
- private Integer lifeCycle;
-
- public Integer getLifeCycle() {
+ private Byte lifeCycle;
+
+ public Byte getLifeCycle() {
return lifeCycle;
}
- public void setLifeCycle(Integer lifeCycle) {
+ public void setLifeCycle(Byte lifeCycle) {
this.lifeCycle = lifeCycle;
}
//投用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp useDate;
-
+
public Timestamp getUseDate() {
return useDate;
}
@@ -151,29 +151,29 @@
this.useDate = useDate;
}
//维修状态 1:维修中 2：已修好
- private Integer repairStatus;
-
- public Integer getRepairStatus() {
+ private Byte repairStatus;
+
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
//停用状态 1:停用 2.在用 3.维修 4.报废
- private Integer stopStatus;
-
- public Integer getStopStatus() {
+ private Byte stopStatus;
+
+ public Byte getStopStatus() {
return stopStatus;
}
- public void setStopStatus(Integer stopStatus) {
+ public void setStopStatus(Byte stopStatus) {
this.stopStatus = stopStatus;
}
//上次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousCheckDate;
-
+
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -184,7 +184,7 @@
//上次检测日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTestDate;
-
+
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -195,7 +195,7 @@
//上次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTakecareDate;
-
+
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -206,7 +206,7 @@
//下次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextCheckDate;
-
+
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -217,7 +217,7 @@
//下次检测日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTestDate;
-
+
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -228,7 +228,7 @@
//下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTakecareDate;
-
+
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -238,7 +238,7 @@
}
//负责人ID外键
private Long leadingPersonId;
-
+
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -248,7 +248,7 @@
}
//负责人名称
private String leadingPersonName;
-
+
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -258,7 +258,7 @@
}
//负责人部门外键
private Long leadingPersonDepartmentId;
-
+
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -268,7 +268,7 @@
}
//供应商
private String supplyName;
-
+
public String getSupplyName() {
return supplyName;
}
@@ -278,7 +278,7 @@
}
//使用说明
private String useMemo;
-
+
public String getUseMemo() {
return useMemo;
}
@@ -288,7 +288,7 @@
}
//是否检查 1：是 2：否
private Integer isNeedCheck;
-
+
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -298,7 +298,7 @@
}
//检查周期
private String checkCycle;
-
+
public String getCheckCycle() {
return checkCycle;
}
@@ -308,7 +308,7 @@
}
//检查提前提醒
private String checkWarn;
-
+
public String getCheckWarn() {
return checkWarn;
}
@@ -318,7 +318,7 @@
}
//是否检测 1：是 2：否
private Integer isNeedTest;
-
+
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -328,7 +328,7 @@
}
//检测周期
private String testCycle;
-
+
public String getTestCycle() {
return testCycle;
}
@@ -338,7 +338,7 @@
}
//检测提前提醒
private String testWarn;
-
+
public String getTestWarn() {
return testWarn;
}
@@ -348,7 +348,7 @@
}
//是否保养 1：是 2：否
private Integer isNeedTakecare;
-
+
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -358,7 +358,7 @@
}
//检查内容
private String checkContent;
-
+
public String getCheckContent() {
return checkContent;
}
@@ -368,7 +368,7 @@
}
//负责部门/外键
private Long leadingDepartmentId;
-
+
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -378,7 +378,7 @@
}
//检查指标
private String checkPoint;
-
+
public String getCheckPoint() {
return checkPoint;
}
@@ -388,7 +388,7 @@
}
//预警值
private String alertNum;
-
+
public String getAlertNum() {
return alertNum;
}
@@ -398,7 +398,7 @@
}
//联锁值
private String lockNum;
-
+
public String getLockNum() {
return lockNum;
}
@@ -408,7 +408,7 @@
}
//停用理由
private String stopReason;
-
+
public String getStopReason() {
return stopReason;
}
@@ -418,7 +418,7 @@
}
//停用后措施
private String afterStopStep;
-
+
public String getAfterStopStep() {
return afterStopStep;
}
@@ -429,7 +429,7 @@
//实际停用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualStopDate;
-
+
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -439,7 +439,7 @@
}
//停用提交人/外键
private Long stopSubmitPersonId;
-
+
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -449,7 +449,7 @@
}
//停用提交人名称
private String stopSubmitPersonName;
-
+
public String getStopSubmitPersonName() {
return stopSubmitPersonName;
}
@@ -460,7 +460,7 @@
//停用提交日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp stopSubmitDate;
-
+
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -470,7 +470,7 @@
}
//恢复理由
private String recoveryReason;
-
+
public String getRecoveryReason() {
return recoveryReason;
}
@@ -481,7 +481,7 @@
//恢复填报日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp recoverySubmitDate;
-
+
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -492,7 +492,7 @@
//实际恢复日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualRecoveryDate;
-
+
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -502,7 +502,7 @@
}
//报废理由
private String destoryReason;
-
+
public String getDestoryReason() {
return destoryReason;
}
@@ -513,7 +513,7 @@
//报废填报日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp destorySubmitDate;
-
+
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -524,7 +524,7 @@
//实际报废日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualDestoryDate;
-
+
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -534,7 +534,7 @@
}
//区域ID
private Long areaId;
-
+
public Long getAreaId() {
return areaId;
}
@@ -544,7 +544,7 @@
}
//区域名称
private String areaName;
-
+
public String getAreaName() {
return areaName;
}
@@ -554,7 +554,7 @@
}
//保养周期
private String takecareCycle;
-
+
public String getTakecareCycle() {
return takecareCycle;
}
@@ -564,7 +564,7 @@
}
//是否删除 0:未删除 1:删除
private Integer delFlag;
-
+
public Integer getDelFlag() {
return delFlag;
}
@@ -572,5 +572,5 @@
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
-
-}
\ No newline at end of file
+
+}
--
Gitblit v1.9.2