From a8ddac646d5129e9818ea82f404d0c0a8d2bc239 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 09 十一月 2023 10:39:25 +0800
Subject: [PATCH] 设备参数阈值管理接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 140 insertions(+), 40 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 9cc9f70..64a01fa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -32,172 +32,156 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_equipment瀵硅薄", description="mom_eam_equipment")
-public class Equipment extends JeecgEntity implements Serializable {
+public class Equipment implements Serializable {
private static final long serialVersionUID = 1L;
+ private String id;
/**璁惧缂栫爜*/
- @Excel(name = "璁惧缂栫爜", width = 15)
+ @Excel(name = "缁熶竴缂栫爜", width = 15,orderNum = "0")
@ApiModelProperty(value = "璁惧缂栫爜")
private String num;
/**璁惧鍚嶇О*/
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 15,orderNum = "1")
@ApiModelProperty(value = "璁惧鍚嶇О")
private String name;
/**璁惧鍨嬪彿*/
- @Excel(name = "璁惧鍨嬪彿", width = 15)
+ @Excel(name = "璁惧鍨嬪彿", width = 15,orderNum = "30")
@ApiModelProperty(value = "璁惧鍨嬪彿")
private String model;
/**璁惧瑙勬牸*/
- @Excel(name = "璁惧瑙勬牸", width = 15)
+ @Excel(name = "璁惧瑙勬牸", width = 15,orderNum = "31")
@ApiModelProperty(value = "璁惧瑙勬牸")
private String specification;
/**璁惧鐘舵��*/
- @Excel(name = "璁惧鐘舵��", width = 15)
+ @Excel(name = "璁惧鐘舵��", width = 15,orderNum = "17",dicCode = "equipment_status")
@ApiModelProperty(value = "璁惧鐘舵��")
@Dict(dicCode = "equipment_status")
private String equipmentStatus;
/**鎶�鏈姸鎬�*/
- @Excel(name = "鎶�鏈姸鎬�", width = 15)
@ApiModelProperty(value = "鎶�鏈姸鎬�")
+ @Excel(name = "鎶�鏈姸鎬�", width = 15,orderNum = "18",dicCode = "technology_status")
@Dict(dicCode = "technology_status")
private String technologyStatus;
/**璧勪骇缂栧彿*/
- @Excel(name = "璧勪骇缂栧彿", width = 15)
@ApiModelProperty(value = "璧勪骇缂栧彿")
private String assetNumber;
/**鎵�灞炲垎绫�*/
- @Excel(name = "鎵�灞炲垎绫�", width = 15)
+ @Excel(name = "鎵�灞炲垎绫�", width = 15,orderNum = "7",dictTable = "mom_eam_equipment_category",dicCode = "id",dicText = "name")
@ApiModelProperty(value = "鎵�灞炲垎绫�")
@Dict(dictTable = "mom_eam_equipment_category",dicCode = "id",dicText = "name")
private String equipmentCategoryId;
/**鐗圭璁惧*/
- @Excel(name = "鐗圭璁惧锛堟槸銆佸惁锛�", width = 15)
+ @Excel(name = "鍏抽敭璁惧鏍囪瘑",orderNum = "8",width = 15,dicCode = "specific_equipment")
@ApiModelProperty(value = "鐗圭璁惧锛堟槸銆佸惁锛�")
@Dict(dicCode = "specific_equipment")
private String specificEquipment;
/**璁惧鍥剧墖*/
- @Excel(name = "璁惧鍥剧墖", width = 15)
@ApiModelProperty(value = "璁惧鍥剧墖")
private String equipmentPhoto;
/**鍒堕�犲晢*/
- @Excel(name = "鍒堕�犲晢", width = 15)
+ @Excel(name = "璧勪骇鍒堕�犲晢", width = 15,orderNum = "28")
@ApiModelProperty(value = "鍒堕�犲晢")
@Dict(dicCode = "id",dictTable="mom_base_constructor",dicText="name")
private String constructorId;
/**渚涘簲鍟�*/
- @Excel(name = "渚涘簲鍟�", width = 15)
@ApiModelProperty(value = "渚涘簲鍟�")
@Dict(dicCode = "id",dictTable="mom_base_supplier",dicText="name")
private String supplierId;
/**鍑哄巶缂栧彿*/
- @Excel(name = "鍑哄巶缂栧彿", width = 15)
+ @Excel(name = "鍑哄巶缂栧彿", width = 15,orderNum = "27")
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNumber;
/**鍑哄巶鏃ユ湡*/
- @Excel(name = "鍑哄巶鏃ユ湡", width = 15)
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 15,orderNum = "23")
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
private String leaveFactoryDate;
/**楠屾敹鏃ユ湡*/
- @Excel(name = "楠屾敹鏃ユ湡", width = 15)
+ @Excel(name = "楠屾敹鏃ユ湡", width = 15,orderNum = "26")
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
private String acceptanceCheckDate;
/**鎵�鏈夌粍缁�*/
- @Excel(name = "鎵�鏈夌粍缁�", width = 15)
@ApiModelProperty(value = "鎵�鏈夌粍缁�")
@Dict(dicCode = "id",dictTable="sys_depart",dicText="depart_name")
private String affiliationId;
/**绠＄悊缁勭粐*/
- @Excel(name = "绠＄悊缁勭粐", width = 15)
+ @Excel(name = "缁存姢閮ㄩ棬", width = 15,orderNum = "4",dicCode = "id",dictTable="sys_depart",dicText="depart_name")
@ApiModelProperty(value = "绠＄悊缁勭粐")
@Dict(dicCode = "id",dictTable="sys_depart",dicText="depart_name")
private String manageId;
/**绠＄悊浜�*/
- @Excel(name = "绠＄悊浜�", width = 15)
@ApiModelProperty(value = "绠＄悊浜�")
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String manager;
/**浣跨敤閮ㄩ棬*/
- @Excel(name = "浣跨敤閮ㄩ棬", width = 15)
+ @Excel(name = "浣跨敤閮ㄩ棬", width = 15,orderNum = "2",dicCode = "id",dictTable="sys_depart",dicText="depart_name")
@ApiModelProperty(value = "浣跨敤閮ㄩ棬")
@Dict(dicCode = "id",dictTable="sys_depart",dicText="depart_name")
private String useId;
/**璐ｄ换浜�*/
- @Excel(name = "璐ｄ换浜�", width = 15)
@ApiModelProperty(value = "璐ｄ换浜�")
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String functionary;
/**浣嶇疆*/
- @Excel(name = "浣嶇疆", width = 15)
+ @Excel(name = "瀹夎浣嶇疆", width = 15,orderNum = "22")
@ApiModelProperty(value = "浣嶇疆")
private String location;
/**閲嶈搴�*/
- @Excel(name = "閲嶈搴�", width = 15)
+ @Excel(name = "ABC鏍囪瘑", width = 15,orderNum = "6")
@ApiModelProperty(value = "閲嶈搴�")
@Dict(dicCode = "id",dictTable="mom_eam_equipment_importance",dicText="name")
private String equipmentImportanceId;
/**宸ヨ壓鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�*/
- @Excel(name = "宸ヨ壓鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�", width = 15)
@ApiModelProperty(value = "宸ヨ壓鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�")
private String processParameters;
/**绮惧害鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�*/
- @Excel(name = "绮惧害鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�", width = 15)
@ApiModelProperty(value = "绮惧害鍙傛暟绠＄悊锛�1锛氭槸锛�0锛氬惁锛�")
private String precisionParameters;
/**妫�瀹氱鐞嗭紙1锛氭槸锛�0锛氬惁锛�*/
- @Excel(name = "妫�瀹氱鐞嗭紙1锛氭槸锛�0锛氬惁锛�", width = 15)
@ApiModelProperty(value = "妫�瀹氱鐞嗭紙1锛氭槸锛�0锛氬惁锛�")
private String verification;
/**妫�瀹氬懆鏈�*/
- @Excel(name = "妫�瀹氭棩鏈�", width = 15)
@ApiModelProperty(value = "妫�瀹氭棩鏈�")
private String verificationPeriod;
/**涓婃閴村畾鏃ユ湡*/
- @Excel(name = "涓婃閴村畾鏃ユ湡", width = 15)
@ApiModelProperty(value = "涓婃妫�瀹氭棩鏈�")
private String lastVerificationDate;
/**涓嬫閴村畾鏃ユ湡*/
- @Excel(name = "涓嬫閴村畾鏃ユ湡", width = 15)
@ApiModelProperty(value = "涓嬫妫�瀹氭棩鏈�")
private String nextVerificationDate;
/**鐘舵��*/
- @Excel(name = "鐘舵��", width = 15)
@ApiModelProperty(value = "鐘舵��")
private String status = CommonConstant.STATUS_1;
/**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
- @ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Excel(name = "宸ュ尯", width = 15,orderNum = "3")
+ @ApiModelProperty(value = "宸ュ尯")
private String equipmentUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
private String equipmentUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
+ @Excel(name = "閲嶉噺", width = 15,orderNum = "19")
@ApiModelProperty(value = "澶囩敤瀛楁3")
private String equipmentUda3;
/**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
+ @Excel(name = "閲嶉噺璁￠噺鍗曚綅", width = 15,orderNum = "20")
@ApiModelProperty(value = "澶囩敤瀛楁4")
private String equipmentUda4;
/**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
+ @Excel(name = "鍔熻兘浣嶇疆", width = 15,orderNum = "21")
@ApiModelProperty(value = "澶囩敤瀛楁5")
private String equipmentUda5;
/**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
private String tenantId;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**璐ｄ换鐝粍*/
- @Excel(name = "璐ｄ换鐝粍", width = 15)
+ @Excel(name = "缁翠慨鐝粍", width = 15,orderNum = "5",dicCode = "id",dictTable="mom_base_team",dicText="name")
@ApiModelProperty(value = "璐ｄ换鐝粍")
@Dict(dicCode = "id",dictTable="mom_base_team",dicText="name")
private String teamId;
@@ -210,10 +194,19 @@
private String sourceId;
@ApiModelProperty(value = "宸ヨ壓鍙傛暟妯℃澘Id")
+ @Dict(dicCode = "id",dictTable = "mom_eam_process_parameters_template",dicText = "name")
private String processParametersTemplateId;
@ApiModelProperty(value = "璁惧绮惧害妯℃澘Id")
+ @Dict(dicCode = "id",dictTable = "mom_eam_precision_parameters_template",dicText = "name")
private String precisionParametersTemplateId;
+
+ @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氱被鍨嬶紙瀛楀吀technology_status_verification_type锛�")
+ @Dict(dicCode = "technology_status_verification_type")
+ private String technologyStatusVerificationType;
+
+ @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氬崟鎹�")
+ private String technologyStatusVerificationBill;
@TableField(exist = false)
private String processParametersTemplateName;
@@ -241,34 +234,47 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealDate;
@ApiModelProperty(value = "璧勯噾鏉ユ簮")
+ @Excel(name = "璧勯噾鏉ユ簮", width = 15,orderNum = "25")
private String fundSource;
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNo;
@ApiModelProperty(value = "鍒堕�犲晢")
private String mfr;
@ApiModelProperty(value = "璧勪骇鏉ユ簮鍥藉")
+ @Excel(name = "璧勪骇鏉ユ簮鍥藉", width = 15,orderNum = "29")
private String sourceCountry;
@ApiModelProperty(value = "鎬诲姛鐜�")
+ @Excel(name = "鎬诲姛鐜�", width = 15,orderNum = "32")
private String gpo;
@ApiModelProperty(value = "鍏抽敭璁惧鏍囪瘑")
private String keyEquipmentIdentification;
+ @Excel(name = "瀹夊叏閰嶇疆", width = 15,orderNum = "9")
@ApiModelProperty(value = "瀹夊叏閰嶇疆")
private String securityConfiguration;
@ApiModelProperty(value = "鍐峰嵈绯荤粺")
+ @Excel(name = "鍐峰嵈绯荤粺", width = 15,orderNum = "10")
+ @Dict(dicCode = "cooling_system")
private String coolingSystem;
+ @Excel(name = "鐏伀鍣�", width = 15,orderNum = "11")
@ApiModelProperty(value = "鐏伀鍣�")
private String fireExtinguisher;
+ @Excel(name = "鐏伀鍣ㄦ湁鏁堟湡", width = 15,orderNum = "12")
@ApiModelProperty(value = "鐏伀鍣ㄦ湁鏁堟湡")
private String fireExtinguisherValidityPeriod;
+ @Excel(name = "鎿嶄綔绯荤粺", width = 15,orderNum = "13")
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
private String operatingSystem;
+ @Excel(name = "绯荤粺", width = 15,orderNum = "14")
@ApiModelProperty(value = "绯荤粺")
private String system;
@ApiModelProperty(value = "绔彛")
+ @Excel(name = "璁惧绔彛", width = 15,orderNum = "15")
private String port;
@ApiModelProperty(value = "鍧愭爣鏁伴噺")
+ @Excel(name = "鍧愭爣鏁伴噺", width = 15,orderNum = "16")
private BigDecimal coordinateNum;
@ApiModelProperty(value = "绔嬮」鍗″彿")
+ @Excel(name = "绔嬮」鍗″彿", width = 15,orderNum = "24")
private String projectApprovalNo;
private String standardA;
private String standardB;
@@ -276,4 +282,98 @@
private String standardD;
private String standardE;
private String standardF;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ @Excel(name = "鍒涘缓浜�", width = 15,orderNum = "33")
+ private java.lang.String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "鍒涘缓鏃堕棿", width = 15,orderNum = "34",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private java.util.Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ @Excel(name = "鏇存柊浜�", width = 15,orderNum = "35")
+ private java.lang.String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "鏇存柊鏃堕棿", width = 15,orderNum = "36",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private java.util.Date updateTime;
+ @TableField(exist = false)
+ private List<EquipmentProcessParameters> processEditTableList;
+ @TableField(exist = false)
+ private List<EquipmentPrecisionParameters> precisionEditTableList;
+ @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
+ @Excel(width = 15,dicCode = "id",dictTable = "mom_base_area",dicText = "name",orderNum = "39", name = "宸ュ尯")
+ private String factoryModelId;
+ @Excel(width = 15,dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "浜х嚎",orderNum = "40")
+ @Dict(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name")
+ private String workCenterId;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15,orderNum = "37",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private Date warrantyStart;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15,orderNum = "38",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private Date warrantyEnd;
+ @Dict(dicCode = "property_status")
+ @Excel(width = 15,orderNum = "41",dicCode = "property_status",name = "璧勪骇鐘舵��")
+ private String propertyStatus;
+
+ @Excel(name = "鎶�鏈姸鎬佸埌鏈熸椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date technologyStatusExpirationTime;
+
+ @Excel(name = "鏈鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date technologyStatusQualificationTime;
+
+ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date nextTechnologyStatusQualificationTime;
+
+ @Excel(name = "鏈浜屼繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date secondMaintenanceTime;
+
+ @Excel(name = "涓嬫浜屼繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date nextSecondMaintenanceTime;
+
+ @Excel(name = "鏈涓変繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date thirdMaintenanceTime;
+
+ @Excel(name = "涓嬫涓変繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date nextThirdMaintenanceTime;
+
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date newStart;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date newEnd;
+ @TableField(exist = false)
+ private String newABCTag;
+ @TableField(exist = false)
+ List<EquipmentSpares> equipmentSparesList;
+ @TableField(exist = false)
+ private String equipmentCategoryUda1;
+ @TableField(exist = false)
+ private String maintenanceOrderId;
+ private String checkPeriod;
}
--
Gitblit v1.9.3