From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/entity/GatewayDevice.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
index 1e9c529..1e7320a 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -25,7 +25,7 @@
@PropertyDef(label = "绯荤粺ID")
private String id;
- @Column(name = "DEVICE_SN_", length = 50)
+ @Column(name = "DEVICE_SN_", length = 100)
@PropertyDef(label = "璁惧搴忓垪鍙�")
private String deviceSn;
@@ -37,17 +37,25 @@
@PropertyDef(label = "鍚嶇О")
private String deviceName;
+ @Column(name = "PRODUCT_ID_", length = 50)
+ @PropertyDef(label = "璁惧绫诲瀷KEY")
+ private String productId;
+
@Column(name = "TYPE_", length = 10)
@PropertyDef(label = "璁惧绫诲瀷")
private String type;
@Column(name = "DEPOT_ID_", length = 30)
- @PropertyDef(label = "鎵�灞炰粨搴�")
+ @PropertyDef(label = "浠撳簱缂栫爜")
private String depotId;
@Column(name = "DEPOT_NAME_", length = 50)
- @PropertyDef(label = "鎵�灞炰粨搴�")
+ @PropertyDef(label = "浠撳簱鍚嶇О")
private String depotName;
+
+ @Column(name = "DEPOT_ID_SYS_", length = 30)
+ @PropertyDef(label = "搴撳尯绯荤粺浠撳簱缂栫爜")
+ private String depotIdSys;
@Column(name = "IP_", length = 20)
@PropertyDef(label = "閫氳IP")
@@ -58,11 +66,11 @@
private Integer port;
@PropertyDef(label = "璁惧鐢ㄦ埛鍚�")
- @Column(name = "username", length = 50)
+ @Column(name = "USERNAME_", length = 50)
private String userName;
@PropertyDef(label = "璁惧瀵嗙爜")
- @Column(name = "password", length = 50)
+ @Column(name = "PASSWORD_", length = 50)
private String password;
@Column(name = "RTSP_", length = 100)
@@ -77,9 +85,9 @@
@Column(name = "PUSH_PROTOCOL_", length = 20)
private String pushProtocol;
- @PropertyDef(label = "鐪佸钩鍙板崗璁�")
- @Column(name = "PROVINCE_PROTOCOL_", length = 20)
- private String provinceProtocol;
+// @PropertyDef(label = "鐪佸钩鍙板崗璁�")
+// @Column(name = "PROVINCE_PROTOCOL_", length = 20)
+// private String provinceProtocol;
@PropertyDef(label = "鍚屾鍗忚")
@Column(name = "SYNC_PROTOCOL_", length = 20)
@@ -97,4 +105,13 @@
@PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
private String remark;
+
+ @Column(name = "CABLE_RULE_", length = 20)
+ @PropertyDef(label = "甯冪嚎瑙勫垯", description = "骞虫柟浠撹〃绀哄眰琛屽垪锛岀瓛浠撹〃绀烘瘡鍦堢殑鍒楁暟")
+ private String cableRule;
+
+ @Column(name = "CABLE_CIR_", length = 20)
+ @PropertyDef(label = "绛掍粨灞傝鍒�", description = "閽堝绛掍粨")
+ private String cableCir;
+
}
--
Gitblit v1.9.3