From 63a66690008a3adbac1d2034e9d060629206cd55 Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期二, 14 十一月 2023 19:02:29 +0800
Subject: [PATCH] 设备安装的代码编写20231114 wmz
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceOrder.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceOrder.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceOrder.java
index 51d3c97..38762a5 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceOrder.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceOrder.java
@@ -1,11 +1,15 @@
package com.ruoyi.iot.domain;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -15,7 +19,7 @@
* @description 璁惧璁㈠崟琛�
* @createTime 2023/11/10 0:25
*/
-public class DeviceOrder extends BaseEntity {
+public class DeviceOrder extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -38,6 +42,11 @@
*/
private Integer userId;
+ /**
+ * 瀹夎宸ュ悕绉�
+ */
+ @Excel(name = "瀹夎宸ュ悕绉�")
+ private String erectoName;
/**
* 鐢ㄦ埛濮撳悕
*/
@@ -72,6 +81,9 @@
* 棰勭害鏃堕棿
*/
@Excel(name = "棰勭害鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date appointmentTime;
/**
@@ -112,6 +124,19 @@
*/
private SysUser suser;
+ /**
+ * 璁惧琛�
+ */
+ private Device devic;
+
+ public Device getDevic() {
+ return devic;
+ }
+
+ public void setDevic(Device devic) {
+ this.devic = devic;
+ }
+
public DeviceOrder() {
}
@@ -145,6 +170,14 @@
public void setUserId(Integer userId) {
this.userId = userId;
+ }
+
+ public String getErectoName() {
+ return erectoName;
+ }
+
+ public void setErectoName(String erectoName) {
+ this.erectoName = erectoName;
}
public String getUserName() {
@@ -255,6 +288,7 @@
this.suser = suser;
}
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -262,6 +296,7 @@
.append("erectoId", getErectoId())
.append("deviceId", getDeviceId())
.append("userId", getUserId())
+ .append("erectoName", getErectoName())
.append("userName", getUserName())
.append("userPhone", getUserPhone())
.append("address", getAddress())
@@ -274,7 +309,8 @@
.append("receiveTime", getReceiveTime())
.append("finshTime", getFinshTime())
.append("state", getState())
- .append("suser",getSuser())
+ .append("suser", getSuser())
+ .append("devic", getDevic())
.toString();
}
}
--
Gitblit v1.8.0