|
@@ -11,7 +11,7 @@ import com.zyc.common.core.domain.BaseEntity;
|
|
|
* 设备基本信息对象 devices
|
|
|
*
|
|
|
* @author ruoyi
|
|
|
- * @date 2024-12-19
|
|
|
+ * @date 2024-12-26
|
|
|
*/
|
|
|
public class Devices extends BaseEntity
|
|
|
{
|
|
@@ -22,49 +22,39 @@ public class Devices extends BaseEntity
|
|
|
|
|
|
|
|
|
@Excel(name = "工单编号")
|
|
|
- private String ticketNumber;
|
|
|
+ private String workOrderCode;
|
|
|
|
|
|
|
|
|
@Excel(name = "申请单位名称")
|
|
|
- private String organizationName;
|
|
|
+ private String applicantDepartment;
|
|
|
|
|
|
|
|
|
@Excel(name = "申请联系人")
|
|
|
- private String systemManager;
|
|
|
+ private String applicantName;
|
|
|
|
|
|
|
|
|
@Excel(name = "申请联系人电话")
|
|
|
- private String contactPhone;
|
|
|
+ private String applicantPhone;
|
|
|
|
|
|
|
|
|
@Excel(name = "技术联系人")
|
|
|
- private String technicalContact;
|
|
|
+ private String techContactName;
|
|
|
|
|
|
|
|
|
@Excel(name = "技术联系人电话")
|
|
|
- private String technicalContactPhone;
|
|
|
+ private String techContactPhone;
|
|
|
|
|
|
|
|
|
@Excel(name = "使用单位")
|
|
|
- private String userUnit;
|
|
|
+ private String userDepartment;
|
|
|
|
|
|
|
|
|
@Excel(name = "信息系统名称")
|
|
|
private String systemName;
|
|
|
|
|
|
-
|
|
|
- @JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
- @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
|
- private Date applicationTime;
|
|
|
-
|
|
|
-
|
|
|
- @JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
- @Excel(name = "回收时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
|
- private Date recoveryTime;
|
|
|
-
|
|
|
-
|
|
|
- @Excel(name = "接入网络")
|
|
|
- private String accessNetwork;
|
|
|
+
|
|
|
+ @Excel(name = "资产编号")
|
|
|
+ private String assetNumber;
|
|
|
|
|
|
|
|
|
@Excel(name = "设备序列号")
|
|
@@ -104,7 +94,7 @@ public class Devices extends BaseEntity
|
|
|
|
|
|
|
|
|
@Excel(name = "所属机柜")
|
|
|
- private String cabinet;
|
|
|
+ private Integer cabinetId;
|
|
|
|
|
|
|
|
|
@Excel(name = "电源模块")
|
|
@@ -182,68 +172,68 @@ public class Devices extends BaseEntity
|
|
|
{
|
|
|
return id;
|
|
|
}
|
|
|
- public void setTicketNumber(String ticketNumber)
|
|
|
+ public void setWorkOrderCode(String workOrderCode)
|
|
|
{
|
|
|
- this.ticketNumber = ticketNumber;
|
|
|
+ this.workOrderCode = workOrderCode;
|
|
|
}
|
|
|
|
|
|
- public String getTicketNumber()
|
|
|
+ public String getWorkOrderCode()
|
|
|
{
|
|
|
- return ticketNumber;
|
|
|
+ return workOrderCode;
|
|
|
}
|
|
|
- public void setOrganizationName(String organizationName)
|
|
|
+ public void setApplicantDepartment(String applicantDepartment)
|
|
|
{
|
|
|
- this.organizationName = organizationName;
|
|
|
+ this.applicantDepartment = applicantDepartment;
|
|
|
}
|
|
|
|
|
|
- public String getOrganizationName()
|
|
|
+ public String getApplicantDepartment()
|
|
|
{
|
|
|
- return organizationName;
|
|
|
+ return applicantDepartment;
|
|
|
}
|
|
|
- public void setSystemManager(String systemManager)
|
|
|
+ public void setApplicantName(String applicantName)
|
|
|
{
|
|
|
- this.systemManager = systemManager;
|
|
|
+ this.applicantName = applicantName;
|
|
|
}
|
|
|
|
|
|
- public String getSystemManager()
|
|
|
+ public String getApplicantName()
|
|
|
{
|
|
|
- return systemManager;
|
|
|
+ return applicantName;
|
|
|
}
|
|
|
- public void setContactPhone(String contactPhone)
|
|
|
+ public void setApplicantPhone(String applicantPhone)
|
|
|
{
|
|
|
- this.contactPhone = contactPhone;
|
|
|
+ this.applicantPhone = applicantPhone;
|
|
|
}
|
|
|
|
|
|
- public String getContactPhone()
|
|
|
+ public String getApplicantPhone()
|
|
|
{
|
|
|
- return contactPhone;
|
|
|
+ return applicantPhone;
|
|
|
}
|
|
|
- public void setTechnicalContact(String technicalContact)
|
|
|
+ public void setTechContactName(String techContactName)
|
|
|
{
|
|
|
- this.technicalContact = technicalContact;
|
|
|
+ this.techContactName = techContactName;
|
|
|
}
|
|
|
|
|
|
- public String getTechnicalContact()
|
|
|
+ public String getTechContactName()
|
|
|
{
|
|
|
- return technicalContact;
|
|
|
+ return techContactName;
|
|
|
}
|
|
|
- public void setTechnicalContactPhone(String technicalContactPhone)
|
|
|
+ public void setTechContactPhone(String techContactPhone)
|
|
|
{
|
|
|
- this.technicalContactPhone = technicalContactPhone;
|
|
|
+ this.techContactPhone = techContactPhone;
|
|
|
}
|
|
|
|
|
|
- public String getTechnicalContactPhone()
|
|
|
+ public String getTechContactPhone()
|
|
|
{
|
|
|
- return technicalContactPhone;
|
|
|
+ return techContactPhone;
|
|
|
}
|
|
|
- public void setUserUnit(String userUnit)
|
|
|
+ public void setUserDepartment(String userDepartment)
|
|
|
{
|
|
|
- this.userUnit = userUnit;
|
|
|
+ this.userDepartment = userDepartment;
|
|
|
}
|
|
|
|
|
|
- public String getUserUnit()
|
|
|
+ public String getUserDepartment()
|
|
|
{
|
|
|
- return userUnit;
|
|
|
+ return userDepartment;
|
|
|
}
|
|
|
public void setSystemName(String systemName)
|
|
|
{
|
|
@@ -254,32 +244,14 @@ public class Devices extends BaseEntity
|
|
|
{
|
|
|
return systemName;
|
|
|
}
|
|
|
- public void setApplicationTime(Date applicationTime)
|
|
|
- {
|
|
|
- this.applicationTime = applicationTime;
|
|
|
- }
|
|
|
-
|
|
|
- public Date getApplicationTime()
|
|
|
- {
|
|
|
- return applicationTime;
|
|
|
- }
|
|
|
- public void setRecoveryTime(Date recoveryTime)
|
|
|
- {
|
|
|
- this.recoveryTime = recoveryTime;
|
|
|
- }
|
|
|
-
|
|
|
- public Date getRecoveryTime()
|
|
|
- {
|
|
|
- return recoveryTime;
|
|
|
- }
|
|
|
- public void setAccessNetwork(String accessNetwork)
|
|
|
+ public void setAssetNumber(String assetNumber)
|
|
|
{
|
|
|
- this.accessNetwork = accessNetwork;
|
|
|
+ this.assetNumber = assetNumber;
|
|
|
}
|
|
|
|
|
|
- public String getAccessNetwork()
|
|
|
+ public String getAssetNumber()
|
|
|
{
|
|
|
- return accessNetwork;
|
|
|
+ return assetNumber;
|
|
|
}
|
|
|
public void setSn(String sn)
|
|
|
{
|
|
@@ -362,14 +334,14 @@ public class Devices extends BaseEntity
|
|
|
{
|
|
|
return uEnd;
|
|
|
}
|
|
|
- public void setCabinet(String cabinet)
|
|
|
+ public void setCabinetId(Integer cabinetId)
|
|
|
{
|
|
|
- this.cabinet = cabinet;
|
|
|
+ this.cabinetId = cabinetId;
|
|
|
}
|
|
|
|
|
|
- public String getCabinet()
|
|
|
+ public Integer getCabinetId()
|
|
|
{
|
|
|
- return cabinet;
|
|
|
+ return cabinetId;
|
|
|
}
|
|
|
public void setDoublePower(String doublePower)
|
|
|
{
|
|
@@ -520,17 +492,15 @@ public class Devices extends BaseEntity
|
|
|
public String toString() {
|
|
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
|
|
.append("id", getId())
|
|
|
- .append("ticketNumber", getTicketNumber())
|
|
|
- .append("organizationName", getOrganizationName())
|
|
|
- .append("systemManager", getSystemManager())
|
|
|
- .append("contactPhone", getContactPhone())
|
|
|
- .append("technicalContact", getTechnicalContact())
|
|
|
- .append("technicalContactPhone", getTechnicalContactPhone())
|
|
|
- .append("userUnit", getUserUnit())
|
|
|
+ .append("workOrderCode", getWorkOrderCode())
|
|
|
+ .append("applicantDepartment", getApplicantDepartment())
|
|
|
+ .append("applicantName", getApplicantName())
|
|
|
+ .append("applicantPhone", getApplicantPhone())
|
|
|
+ .append("techContactName", getTechContactName())
|
|
|
+ .append("techContactPhone", getTechContactPhone())
|
|
|
+ .append("userDepartment", getUserDepartment())
|
|
|
.append("systemName", getSystemName())
|
|
|
- .append("applicationTime", getApplicationTime())
|
|
|
- .append("recoveryTime", getRecoveryTime())
|
|
|
- .append("accessNetwork", getAccessNetwork())
|
|
|
+ .append("assetNumber", getAssetNumber())
|
|
|
.append("sn", getSn())
|
|
|
.append("deviceName", getDeviceName())
|
|
|
.append("manufacturer", getManufacturer())
|
|
@@ -540,7 +510,7 @@ public class Devices extends BaseEntity
|
|
|
.append("uHeight", getuHeight())
|
|
|
.append("uBegin", getuBegin())
|
|
|
.append("uEnd", getuEnd())
|
|
|
- .append("cabinet", getCabinet())
|
|
|
+ .append("cabinetId", getCabinetId())
|
|
|
.append("doublePower", getDoublePower())
|
|
|
.append("hardwareConfig", getHardwareConfig())
|
|
|
.append("applicationDesc", getApplicationDesc())
|