From 8435cf1d25d07b09e2a9937d39bed1c1a422e4f0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 14 十二月 2023 14:10:45 +0800
Subject: [PATCH] 提交正来电子协议解析-1

---
 src/main/java/com/fzzy/gateway/entity/GatewayDevice.java |   68 ++++++++++++++++++++++++++++++----
 1 files changed, 60 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..b69ac87 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -2,11 +2,13 @@
 
 import com.bstek.dorado.annotation.PropertyDef;
 
+import com.fzzy.api.Constant;
 import lombok.Data;
 
 import javax.persistence.*;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 缃戝叧鐩稿叧鐨勮澶囩鐞�
@@ -25,7 +27,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 +39,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 +68,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 +87,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)
@@ -93,6 +103,48 @@
     @PropertyDef(label = "缁勭粐缂栫爜")
     private String orgId;
 
+    @Column(name = "POSITION_", length = 40)
+    @PropertyDef(label = "浣嶇疆")
+    private String position;
+
+
+
+    @Column(name = "CABLE_RULE_", length = 20)
+    @PropertyDef(label = "甯冪嚎瑙勫垯", description = "骞虫柟浠撹〃绀哄眰琛屽垪锛岀瓛浠撹〃绀烘瘡鍦堢殑鍒楁暟")
+    private String cableRule;
+
+    @Column(name = "CABLE_CIR_", length = 20)
+    @PropertyDef(label = "绛掍粨灞傝鍒�", description = "閽堝绛掍粨")
+    private String cableCir;
+
+    @Column(name = "STATUS_", length = 2)
+    @PropertyDef(label = "鍦ㄧ嚎鐘舵��")
+    private String status = Constant.YN_Y;
+
+    @Column(name = "CABLE_START_")
+    @PropertyDef(label = "鐢电紗寮�濮�")
+    private int cableStart;
+
+    @Column(name = "CABLE_END_")
+    @PropertyDef(label = "鐢电紗鎴嚦")
+    private int cableEnd;
+
+    @Column(name = "TH_ADDR_")
+    @PropertyDef(label = "娓╂箍搴﹀湴鍧�")
+    private String thAddr;
+
+    @Column(name = "CABLE_FORMAT", length = 4)
+    @PropertyDef(label = "鐢电紗鍒跺紡")
+    private String cableFormat;
+
+    @Column(name = "CABLE_TYPE", length = 4)
+    @PropertyDef(label = "鐢电紗绫诲瀷")
+    private String cableType;
+
+    @Transient
+    @PropertyDef(label = "璁惧涓婄嚎鏃堕棿")
+    private Date onlineTime;
+
     @Column(name = "REMARK_", length = 200)
     @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
     private String remark;

--
Gitblit v1.9.3