From 231cdeb9b7a55ba08fb8cffda35f5535b9292873 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 14 十二月 2023 19:33:41 +0800
Subject: [PATCH] 提交正来电子协议解析-2

---
 src/main/java/com/fzzy/gateway/entity/GatewayDevice.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
index 4670371..d2dd7be 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -107,9 +107,7 @@
     @PropertyDef(label = "浣嶇疆")
     private String position;
 
-    @Column(name = "REMARK_", length = 200)
-    @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
-    private String remark;
+
 
     @Column(name = "CABLE_RULE_", length = 20)
     @PropertyDef(label = "甯冪嚎瑙勫垯", description = "骞虫柟浠撹〃绀哄眰琛屽垪锛岀瓛浠撹〃绀烘瘡鍦堢殑鍒楁暟")
@@ -123,8 +121,32 @@
     @PropertyDef(label = "鍦ㄧ嚎鐘舵��")
     private String status = Constant.YN_Y;
 
+    @Column(name = "CABLE_START_", length = 4)
+    @PropertyDef(label = "鐢电紗寮�濮�")
+    private String cableStart;
+
+    @Column(name = "CABLE_END_", length = 4)
+    @PropertyDef(label = "鐢电紗鎴嚦")
+    private String cableEnd;
+
+    @Column(name = "TH_ADDR_",length = 4)
+    @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