From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java | 180 +++++++++++++++++-------------------------------------------
1 files changed, 51 insertions(+), 129 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java b/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java
index 87d8853..9f7abc0 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java
@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.sandu.ximon.dao.bo.NewNovaInfoBo;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -31,15 +32,6 @@
*/
private String name;
- /**
- * 鎾斁鍣ㄥ悕绉�(server)
- */
- private String playerName;
-
- /**
- * 鎾斁鍣↖D(Vnnox)
- */
- private String playerId;
/**
* 鎾斁鍣ㄥ敮涓�鏍囪瘑,濡傛灉涓簄ull浠ｈ〃娌℃湁缁戝畾鎾斁鍣�(Vnnox)
@@ -52,7 +44,7 @@
private LocalDateTime createTime;
/**
- * 鍒嗚鲸鐜�
+ * 鏄惁鍦ㄧ嚎杩�
*/
private Integer onlineSign;
@@ -64,122 +56,52 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
-// /**
-// * 浜у搧鍚嶇О
-// */
-// @JsonIgnore
-// @TableField(exist = false)
-// private String productName;
-//
-// /**
-// * 鏄剧ず灞忓搴�,鍗曚綅涓哄儚绱�
-// */
-// @TableField(exist = false)
-// private Integer width;
-//
-// /**
-// * 鏄剧ず灞忛珮搴�,鍗曚綅涓哄儚绱�
-// */
-// @TableField(exist = false)
-// private Integer height;
-//
-// /**
-// * 鏃嬭浆瑙掑害:0锛�90锛�180锛�270
-// */
-// @TableField(exist = false)
-// private Integer rotation;
-//
-// /**
-// * 鏄剧ず灞忓埆鍚�
-// */
-// @JsonIgnore
-// @TableField(exist = false)
-// private String aliasName;
-//
-// /**
-// * 鏄惁鏈変汉宸茬粡鐧婚檰
-// */
-// @JsonIgnore
-// @TableField(exist = false)
-// private Boolean logined;
-//
-// /**
-// * 鑻ュ凡缁忔湁浜虹櫥闄嗭紝浠ｈ〃宸茬粡鐧婚檰鐨勭敤鎴峰悕鍒楄〃
-// */
-// @TableField(exist = false)
-// private List<String> username;
-//
-// /**
-// * tcp杩炴帴绔彛
-// */
-// @TableField(exist = false)
-// private Integer tcpPort;
-//
-// /**
-// * ftp杩炴帴绔彛
-// */
-// @TableField(exist = false)
-// private Integer ftpPort;
-//
-// /**
-// * 绯荤粺璁剧疆ftp绔彛
-// */
-// @TableField(exist = false)
-// private Integer syssetFtpPort;
-//
-// /**
-// * 绯荤粺璁剧疆tcp绔彛
-// */
-// @TableField(exist = false)
-// private Integer syssetTcpPort;
-//
-// /**
-// * 缁堢杩斿洖鐨刱ey,鍙備笌ftp鐨勫瘑鐮佺敓浜ц鍒�
-// */
-// @TableField(exist = false)
-// private String key;
-//
-// /**
-// * 绯荤粺骞冲彴淇℃伅锛堟殏鏃朵細鍑虹幇rk3368,rk312x锛�
-// */
-// @TableField(exist = false)
-// private String platform;
-//
-// /**
-// * True琛ㄧず缁堢鏀寔鍔犲瘑妯″紡锛屽綋鐒跺鏋滄槸鏂扮殑缁堢涓�瀹氭槸True
-// */
-// @TableField(exist = false)
-// private Boolean privacy;
-//
-//
-// /**
-// * 褰撳墠灞忎綋鐘舵�侊紝terminalState鍏辨湁6涓��,鍒嗗埆浠ｈ〃锛�
-// * 0锛氭湭杩炴帴浠讳綍缁堢锛屽綋鍓嶅浜庢湭杩炴帴鐘舵��
-// * 1锛氳繛鎺ユ垚鍔熶絾鏄湭鐧诲綍鐘舵��
-// * 2锛氳浠栦汉鐧诲綍鐘舵��
-// * 3锛氱櫥褰曟垚鍔熺姸鎬�
-// * 4锛氬瘑鐮侀敊璇姸鎬�
-// * 5锛氱绾跨姸鎬侊紝澶勪簬鎼滅储涓嶅埌鐨勭姸鎬侊紝浣嗘槸鏇剧粡琚悳绱㈠埌杩�
-// */
-// @TableField(exist = false)
-// private Integer terminalState;
-//
-// /**
-// * 璁板綍鐐瑰嚮蹇界暐瀵嗙爜鐨勬椂闂存埑
-// */
-// @JsonIgnore
-// @TableField(exist = false)
-// private Long ignoreTime;
-//
-// /**
-// * 鏄惁璁颁綇瀵嗙爜锛宼rue琛ㄧず璁颁綇锛宖alse锛岃〃绀烘病鏈�
-// */
-// @TableField(exist = false)
-// private Boolean hasPassword;
-//
-// /**
-// * 瀵嗙爜
-// */
-// @TableField(exist = false)
-// private String password;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0绂荤嚎 1鍦ㄧ嚎
+ */
+ @TableField(exist = false)
+ private Integer isOnline = 0;
+
+ /**
+ * 鐏潌id
+ */
+ @TableField(exist = false)
+ private Long poleId;
+
+ /**
+ * 鐏潌鍚嶇О
+ */
+ @TableField(exist = false)
+ private String poleName;
+
+ /**
+ * 鏈嶅姟鍣ㄨ澶囦俊鎭�
+ */
+ @TableField(exist = false)
+ private NewNovaInfoBo info;
+
+ /**
+ * 灞忓箷寮�鍏� 0鍏� 1寮�
+ */
+ @TableField(exist = false)
+ private int screenPower = 0;
+
+ /**
+ * 闊抽噺 0-100
+ */
+ @TableField(exist = false)
+ private BigDecimal volume = BigDecimal.ZERO;
+
+ /**
+ * 浜害鐧惧垎姣旓紝0-100
+ */
+ @TableField(exist = false)
+ private BigDecimal brightness = BigDecimal.ZERO;
+
+ /**
+ * 鍚屾鐘舵��
+ */
+ @TableField(exist = false)
+ private Integer sync = 0;
+
}
\ No newline at end of file
--
Gitblit v1.9.3