From 96f7af2f3bf9a36dd48e0e6bf4f8a8ca1e31ed7d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 十一月 2023 17:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway

---
 src/main/java/com/fzzy/gateway/entity/GatewayDevice.java |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
index 77966f4..50a19c0 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -1,9 +1,11 @@
 package com.fzzy.gateway.entity;
 
 import com.bstek.dorado.annotation.PropertyDef;
+
 import lombok.Data;
 
 import javax.persistence.*;
+
 import java.io.Serializable;
 
 /**
@@ -23,25 +25,37 @@
     @PropertyDef(label = "绯荤粺ID")
     private String id;
 
-    @Column(name = "DeVICE_ID_", length = 100)
+    @Column(name = "DEVICE_SN_", length = 100)
+    @PropertyDef(label = "璁惧搴忓垪鍙�")
+    private String deviceSn;
+
+    @Column(name = "DEVICE_ID_", length = 50)
     @PropertyDef(label = "璁惧ID")
     private String deviceId;
 
-    @Column(name = "DeVICE_NAME_", length = 50)
+    @Column(name = "DEVICE_NAME_", length = 50)
     @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")
@@ -50,6 +64,14 @@
     @Column(name = "PORT_")
     @PropertyDef(label = "閫氳绔彛")
     private Integer port;
+
+    @PropertyDef(label = "璁惧鐢ㄦ埛鍚�")
+    @Column(name = "USERNAME_", length = 50)
+    private String userName;
+
+    @PropertyDef(label = "璁惧瀵嗙爜")
+    @Column(name = "PASSWORD_", length = 50)
+    private String password;
 
     @Column(name = "RTSP_", length = 100)
     @PropertyDef(label = "瑙嗛RTSP", description = "鐢ㄤ簬灞�鍩熺綉鍐呮姄鎷嶉厤缃�")
@@ -60,12 +82,20 @@
     private String httpUrl;
 
     @PropertyDef(label = "涓婅鍗忚")
-    @Column(name = "pushProtocol", length = 20)
+    @Column(name = "PUSH_PROTOCOL_", length = 20)
     private String pushProtocol;
 
+    @PropertyDef(label = "鐪佸钩鍙板崗璁�")
+    @Column(name = "PROVINCE_PROTOCOL_", length = 20)
+    private String provinceProtocol;
+
     @PropertyDef(label = "鍚屾鍗忚")
-    @Column(name = "syncProtocol", length = 20)
+    @Column(name = "SYNC_PROTOCOL_", length = 20)
     private String syncProtocol;
+
+    @PropertyDef(label = "TCP鏈嶅姟绔彛", description = "閽堝缃戝叧浣滀负TCP鏈嶅姟鏃跺�欑鍙�")
+    @Column(name = "SER_PORT_")
+    private int serPort;
 
     @Column(name = "ORG_ID_", length = 40)
     @PropertyDef(label = "缁勭粐缂栫爜")
@@ -75,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