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 | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 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 68c7daa..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;
/**
* 缃戝叧鐩稿叧鐨勮澶囩鐞�
@@ -105,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 = "骞虫柟浠撹〃绀哄眰琛屽垪锛岀瓛浠撹〃绀烘瘡鍦堢殑鍒楁暟")
@@ -117,4 +117,36 @@
@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