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 | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
index f10ec07..d2dd7be 100644
--- a/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
+++ b/src/main/java/com/fzzy/gateway/entity/GatewayDevice.java
@@ -1,10 +1,14 @@
package com.fzzy.gateway.entity;
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;
/**
* 缃戝叧鐩稿叧鐨勮澶囩鐞�
@@ -23,11 +27,11 @@
@PropertyDef(label = "绯荤粺ID")
private String id;
- @Column(name = "DEVICE_SN_", length = 50)
+ @Column(name = "DEVICE_SN_", length = 100)
@PropertyDef(label = "璁惧搴忓垪鍙�")
private String deviceSn;
- @Column(name = "DEVICE_ID_", length = 100)
+ @Column(name = "DEVICE_ID_", length = 50)
@PropertyDef(label = "璁惧ID")
private String deviceId;
@@ -35,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")
@@ -54,7 +66,15 @@
@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 = "鐢ㄤ簬灞�鍩熺綉鍐呮姄鎷嶉厤缃�")
private String rtsp;
@@ -67,6 +87,10 @@
@Column(name = "PUSH_PROTOCOL_", length = 20)
private String pushProtocol;
+// @PropertyDef(label = "鐪佸钩鍙板崗璁�")
+// @Column(name = "PROVINCE_PROTOCOL_", length = 20)
+// private String provinceProtocol;
+
@PropertyDef(label = "鍚屾鍗忚")
@Column(name = "SYNC_PROTOCOL_", length = 20)
private String syncProtocol;
@@ -79,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_", 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