From f241a39f07acc5d5ede28b4152d74cbb84e4885b Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Tue, 08 Nov 2022 08:37:36 +0800
Subject: [PATCH] 安全物资和设备管理
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 289 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 182 insertions(+), 107 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 edf71e4..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
@@ -1,22 +1,23 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
-
+import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 设备设施详细信息(EquipmentInfo)表实体类
*
* @author xurui
- * @since 2022-07-20 09:19:29
+ * @since 2022-08-29 08:37:54
*/
@SuppressWarnings("serial")
@TableName("equipment_info")
public class EquipmentInfo extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -28,8 +29,8 @@
}
//类型/类别外键
- private Long equipmentTypeId;
-
+ private Long equipmentTypeId;
+
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -37,9 +38,9 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
- private Integer infoType;
-
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ private Integer infoType;
+
public Integer getInfoType() {
return infoType;
}
@@ -48,8 +49,8 @@
this.infoType = infoType;
}
//名称
- private String qName;
-
+ private String qName;
+
public String getQName() {
return qName;
}
@@ -58,8 +59,8 @@
this.qName = qName;
}
//位号
- private String positionNum;
-
+ private String positionNum;
+
public String getPositionNum() {
return positionNum;
}
@@ -68,8 +69,8 @@
this.positionNum = positionNum;
}
//用途
- private String qUsage;
-
+ private String qUsage;
+
public String getQUsage() {
return qUsage;
}
@@ -78,8 +79,8 @@
this.qUsage = qUsage;
}
//型号
- private String model;
-
+ private String model;
+
public String getModel() {
return model;
}
@@ -88,8 +89,8 @@
this.model = model;
}
//单位部门外键
- private Long departmentId;
-
+ private Long departmentId;
+
public Long getDepartmentId() {
return departmentId;
}
@@ -98,8 +99,8 @@
this.departmentId = departmentId;
}
//设置部位
- private String setPart;
-
+ private String setPart;
+
public String getSetPart() {
return setPart;
}
@@ -108,8 +109,9 @@
this.setPart = setPart;
}
//生产日期
- private Timestamp produceTime;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp produceTime;
+
public Timestamp getProduceTime() {
return produceTime;
}
@@ -118,8 +120,8 @@
this.produceTime = produceTime;
}
//使用期限(天)
- private String useEndDay;
-
+ private String useEndDay;
+
public String getUseEndDay() {
return useEndDay;
}
@@ -128,18 +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;
}
//投用日期
- private Timestamp useDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp useDate;
+
public Timestamp getUseDate() {
return useDate;
}
@@ -148,28 +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;
}
//上次检查日期
- private Timestamp previousCheckDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp previousCheckDate;
+
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -178,8 +182,9 @@
this.previousCheckDate = previousCheckDate;
}
//上次检测日期
- private Timestamp previousTestDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp previousTestDate;
+
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -188,8 +193,9 @@
this.previousTestDate = previousTestDate;
}
//上次保养日期
- private Timestamp previousTakecareDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp previousTakecareDate;
+
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -198,8 +204,9 @@
this.previousTakecareDate = previousTakecareDate;
}
//下次检查日期
- private Timestamp nextCheckDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp nextCheckDate;
+
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -208,8 +215,9 @@
this.nextCheckDate = nextCheckDate;
}
//下次检测日期
- private Timestamp nextTestDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp nextTestDate;
+
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -218,8 +226,9 @@
this.nextTestDate = nextTestDate;
}
//下次保养日期
- private Timestamp nextTakecareDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp nextTakecareDate;
+
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -228,8 +237,8 @@
this.nextTakecareDate = nextTakecareDate;
}
//负责人ID外键
- private Long leadingPersonId;
-
+ private Long leadingPersonId;
+
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -237,9 +246,19 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
}
+ //负责人名称
+ private String leadingPersonName;
+
+ public String getLeadingPersonName() {
+ return leadingPersonName;
+ }
+
+ public void setLeadingPersonName(String leadingPersonName) {
+ this.leadingPersonName = leadingPersonName;
+ }
//负责人部门外键
- private Long leadingPersonDepartmentId;
-
+ private Long leadingPersonDepartmentId;
+
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -248,8 +267,8 @@
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
//供应商
- private String supplyName;
-
+ private String supplyName;
+
public String getSupplyName() {
return supplyName;
}
@@ -258,8 +277,8 @@
this.supplyName = supplyName;
}
//使用说明
- private String useMemo;
-
+ private String useMemo;
+
public String getUseMemo() {
return useMemo;
}
@@ -268,8 +287,8 @@
this.useMemo = useMemo;
}
//是否检查 1：是 2：否
- private Integer isNeedCheck;
-
+ private Integer isNeedCheck;
+
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -278,8 +297,8 @@
this.isNeedCheck = isNeedCheck;
}
//检查周期
- private String checkCycle;
-
+ private String checkCycle;
+
public String getCheckCycle() {
return checkCycle;
}
@@ -288,8 +307,8 @@
this.checkCycle = checkCycle;
}
//检查提前提醒
- private String checkWarn;
-
+ private String checkWarn;
+
public String getCheckWarn() {
return checkWarn;
}
@@ -298,8 +317,8 @@
this.checkWarn = checkWarn;
}
//是否检测 1：是 2：否
- private Integer isNeedTest;
-
+ private Integer isNeedTest;
+
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -308,8 +327,8 @@
this.isNeedTest = isNeedTest;
}
//检测周期
- private String testCycle;
-
+ private String testCycle;
+
public String getTestCycle() {
return testCycle;
}
@@ -318,8 +337,8 @@
this.testCycle = testCycle;
}
//检测提前提醒
- private String testWarn;
-
+ private String testWarn;
+
public String getTestWarn() {
return testWarn;
}
@@ -328,8 +347,8 @@
this.testWarn = testWarn;
}
//是否保养 1：是 2：否
- private Integer isNeedTakecare;
-
+ private Integer isNeedTakecare;
+
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -338,8 +357,8 @@
this.isNeedTakecare = isNeedTakecare;
}
//检查内容
- private String checkContent;
-
+ private String checkContent;
+
public String getCheckContent() {
return checkContent;
}
@@ -348,8 +367,8 @@
this.checkContent = checkContent;
}
//负责部门/外键
- private Long leadingDepartmentId;
-
+ private Long leadingDepartmentId;
+
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -358,8 +377,8 @@
this.leadingDepartmentId = leadingDepartmentId;
}
//检查指标
- private String checkPoint;
-
+ private String checkPoint;
+
public String getCheckPoint() {
return checkPoint;
}
@@ -368,8 +387,8 @@
this.checkPoint = checkPoint;
}
//预警值
- private String alertNum;
-
+ private String alertNum;
+
public String getAlertNum() {
return alertNum;
}
@@ -378,8 +397,8 @@
this.alertNum = alertNum;
}
//联锁值
- private String lockNum;
-
+ private String lockNum;
+
public String getLockNum() {
return lockNum;
}
@@ -388,8 +407,8 @@
this.lockNum = lockNum;
}
//停用理由
- private String stopReason;
-
+ private String stopReason;
+
public String getStopReason() {
return stopReason;
}
@@ -398,8 +417,8 @@
this.stopReason = stopReason;
}
//停用后措施
- private String afterStopStep;
-
+ private String afterStopStep;
+
public String getAfterStopStep() {
return afterStopStep;
}
@@ -408,8 +427,9 @@
this.afterStopStep = afterStopStep;
}
//实际停用日期
- private Timestamp actualStopDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp actualStopDate;
+
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -418,8 +438,8 @@
this.actualStopDate = actualStopDate;
}
//停用提交人/外键
- private Long stopSubmitPersonId;
-
+ private Long stopSubmitPersonId;
+
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -427,9 +447,20 @@
public void setStopSubmitPersonId(Long stopSubmitPersonId) {
this.stopSubmitPersonId = stopSubmitPersonId;
}
+ //停用提交人名称
+ private String stopSubmitPersonName;
+
+ public String getStopSubmitPersonName() {
+ return stopSubmitPersonName;
+ }
+
+ public void setStopSubmitPersonName(String stopSubmitPersonName) {
+ this.stopSubmitPersonName = stopSubmitPersonName;
+ }
//停用提交日期
- private Timestamp stopSubmitDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp stopSubmitDate;
+
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -438,8 +469,8 @@
this.stopSubmitDate = stopSubmitDate;
}
//恢复理由
- private String recoveryReason;
-
+ private String recoveryReason;
+
public String getRecoveryReason() {
return recoveryReason;
}
@@ -448,8 +479,9 @@
this.recoveryReason = recoveryReason;
}
//恢复填报日期
- private Timestamp recoverySubmitDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp recoverySubmitDate;
+
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -458,8 +490,9 @@
this.recoverySubmitDate = recoverySubmitDate;
}
//实际恢复日期
- private Timestamp actualRecoveryDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp actualRecoveryDate;
+
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -468,8 +501,8 @@
this.actualRecoveryDate = actualRecoveryDate;
}
//报废理由
- private String destoryReason;
-
+ private String destoryReason;
+
public String getDestoryReason() {
return destoryReason;
}
@@ -478,8 +511,9 @@
this.destoryReason = destoryReason;
}
//报废填报日期
- private Timestamp destorySubmitDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp destorySubmitDate;
+
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -488,8 +522,9 @@
this.destorySubmitDate = destorySubmitDate;
}
//实际报废日期
- private Timestamp actualDestoryDate;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp actualDestoryDate;
+
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -497,5 +532,45 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
-}
\ No newline at end of file
+ //区域ID
+ private Long areaId;
+
+ public Long getAreaId() {
+ return areaId;
+ }
+
+ public void setAreaId(Long areaId) {
+ this.areaId = areaId;
+ }
+ //区域名称
+ private String areaName;
+
+ public String getAreaName() {
+ return areaName;
+ }
+
+ public void setAreaName(String areaName) {
+ this.areaName = areaName;
+ }
+ //保养周期
+ private String takecareCycle;
+
+ public String getTakecareCycle() {
+ return takecareCycle;
+ }
+
+ public void setTakecareCycle(String takecareCycle) {
+ this.takecareCycle = takecareCycle;
+ }
+ //是否删除 0:未删除 1:删除
+ private Integer delFlag;
+
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+
+}
--
Gitblit v1.9.2