From fbcbe6c975554786683c38798ce8527d27993543 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 20 一月 2024 17:49:59 +0800
Subject: [PATCH] 测试调整筒仓的逻辑
---
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 50a19c0..f65eead 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;
/**
* 缃戝叧鐩稿叧鐨勮澶囩鐞�
@@ -57,6 +59,10 @@
@PropertyDef(label = "搴撳尯绯荤粺浠撳簱缂栫爜")
private String depotIdSys;
+ @Column(name = "DEPOT_TYPE_", length = 10)
+ @PropertyDef(label = "浠撳簱绫诲瀷", description = "骞虫埧浠�")
+ private String depotType;
+
@Column(name = "IP_", length = 20)
@PropertyDef(label = "閫氳IP")
private String ip;
@@ -85,9 +91,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)
@@ -101,9 +107,10 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String orgId;
- @Column(name = "REMARK_", length = 200)
- @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
- private String remark;
+ @Column(name = "POSITION_", length = 40)
+ @PropertyDef(label = "浣嶇疆")
+ private String position;
+
@Column(name = "CABLE_RULE_", length = 20)
@@ -114,4 +121,36 @@
@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