From 4aaab689ed4e94dd9e34ec22c661b3227befe8a8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 18:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java | 74 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java
index 30eb639..837dd60 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java
@@ -1,36 +1,86 @@
package com.sandu.ximon.dao.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import lombok.Data;
/**
* 鎽勫儚澶�
+ * @TableName monitor
*/
+@TableName(value ="monitor")
@Data
public class Monitor implements Serializable {
-
+ /**
+ *
+ */
@TableId(type = IdType.AUTO)
private Long id;
- private Long userId;
+ /**
+ * 璁惧搴忓垪鍙�
+ */
+ private String deviceSerial;
- private String kind;
+ /**
+ * 璁惧楠岃瘉鐮�
+ */
+ private String devicesCode;
- private String size;
+ /**
+ * 璁惧鍚嶇О
+ */
+ private String deviceName;
- private String name;
+ /**
+ * 璁惧绫诲瀷
+ */
+ private String deviceType;
- private String macId;
+ /**
+ * 鍦ㄧ嚎鐘舵�侊細0-涓嶅湪绾匡紝1-鍦ㄧ嚎
+ */
+ private Integer equipmentState;
- private String state;
+ /**
+ * 鏄惁鍔犲瘑锛�0-涓嶅姞瀵嗭紝1-鍔犲瘑
+ */
+ private Integer isEncrypt;
- private Long lampId;
+ /**
+ * 宸ヤ綔鐘舵��
+ */
+ private Integer workState;
- private LocalDateTime createTime;
+ /**
+ * 缁戝畾鐘舵��
+ */
+ private Integer bindingState;
+ /**
+ * 澶囨敞
+ */
+ private String note;
-}
+ /**
+ *
+ */
+ private LocalDateTime addTime;
+
+ /**
+ *
+ */
+ private LocalDateTime updateTime;
+
+ /**
+ * MAC鍦板潃
+ */
+ private String netAddress;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
--
Gitblit v1.9.3