From 2884bf1f32b51129a83125ecfc2cf8526f71154f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 24 八月 2023 15:34:43 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4
---
igds-core/src/main/java/com/ld/igds/models/Depot.java | 95 ++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/Depot.java b/igds-core/src/main/java/com/ld/igds/models/Depot.java
index cf12217..3467c9b 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Depot.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Depot.java
@@ -10,14 +10,12 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
+
/**
- * 浠撴埧鏁栭棿-涓庝粨鎴垮缓绛戜笉涓�鏍凤紝鍙綔涓哄叿浣撲粨搴撲娇鐢紝绯荤粺涓粨搴撶殑鏈�灏忓崟浣嶅畾涔�
- *
- * @author Andy
- * <p>
- * 鐗堟湰鍗囩骇璁板綍锛� 1锛岃皟鏁村瓧娈电粨鏋勶紝鍒犻櫎閰嶇疆绫诲瀷瀛楁
+ * @Desc: 鍩虹淇℃伅-璐т綅淇℃伅
+ * @author: Andy
+ * @update-time: 2023/5/26
*/
@Data
@Entity
@@ -29,12 +27,12 @@
*/
private static final long serialVersionUID = 1L;
- @Id
- @Column(name = "ID_", length = 50)
- @PropertyDef(label = "浠撳簱缂栧彿")
- private String id;
@Id
+ @Column(name = "ID_", length = 50)
+ @PropertyDef(label = "璐т綅缂栧彿")
+ private String id;
+
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
@@ -42,66 +40,69 @@
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鎵�灞炲垎搴�")
private String deptId;
+
+ @Column(name = "ggm", length = 50)
+ @PropertyDef(label = "鍥借鐮�")
+ private String ggm;
@Column(name = "NAME_", length = 50)
- @PropertyDef(label = "浠撳簱鍚嶇О")
+ @PropertyDef(label = "璐т綅鍚嶇О")
private String name;
- @Column(name = "BUILDING_ID_", length = 50)
- @PropertyDef(label = "鎵�灞炰粨鎴垮缓绛�")
+ @Column(name = "BUILDING_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炰粨鎴�")
private String buildingId;
+ @Column(name = "GRANARY_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲粧闂�")
+ private String granaryId;
+
@Column(name = "DEPOT_TYPE_", length = 10)
- @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏅�氬钩鎴夸粨")
+ @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏍规嵁鍥芥爣閰嶇疆绫诲瀷锛屽钩鎴夸粨銆佺珛绛掍粨銆佹祬鍦嗕粨銆佸偍娌圭綈")
private String depotType;
@Column(name = "DEPOT_STATUS_", length = 10)
- @PropertyDef(label = "浠撳簱鐘舵��", description = "")
+ @PropertyDef(label = "浠撳簱鐘舵��", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
private String depotStatus;
@Column(name = "STORE_TYPE_", length = 6)
- @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "1:鏁ｈ鍌ㄧ伯 2:鍖呰鍌ㄧ伯 3:鍥村寘鏁ｅ瓨 9:鍏朵粬")
+ @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "涓庡簱瀛樿〃鍏宠仈")
private String storeType;
@Column(name = "STORAGE_MAX_")
- @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ @PropertyDef(label = "璁捐鍌ㄩ噺", description = "鍗曚綅锛氬惃")
private Double storageMax;
- /**
- * 瀹為檯鍌ㄩ噺闇�瑕佺嫭绔嬪幓淇敼
- */
@Column(name = "STORAGE_REAL_", insertable = true)
- @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G锛岄�氳繃搴撳瓨鍙樻洿")
private Double storageReal;
- @Column(name = "ORIENTATION_", length = 10)
- @PropertyDef(label = "鏈濆悜", description = "涓溿�佸崡銆佽タ銆佸寳")
- private String orientation;
-
@Column(name = "FOOD_TYPE_", length = 10)
- @PropertyDef(label = "绮鎬ц川")
+ @PropertyDef(label = "绮鎬ц川", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
private String foodType;
@Column(name = "FOOD_VARIETY_", length = 10)
- @PropertyDef(label = "绮鍝佺")
+ @PropertyDef(label = "绮鍝佺", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
private String foodVariety;
@Column(name = "FOOD_LEVEL_", length = 10)
- @PropertyDef(label = "绮绛夌骇")
+ @PropertyDef(label = "绮绛夌骇", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
private String foodLevel;
- @Column(name = "FOOD_LOCATION_", length = 200)
- @PropertyDef(label = "绮浜у湴")
+ @Column(name = "FOOD_LOCATION_", length = 50)
+ @PropertyDef(label = "绮浜у湴", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
private String foodLocation;
- // -----浠ヤ笅涓虹伯椋熻川閲忎俊鎭� ------//
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "绮骞翠唤", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String foodYear;
@Column(name = "PER_WET_")
- @PropertyDef(label = "姘村垎", description = "鐧惧垎姣�")
+ @PropertyDef(label = "姘村垎", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
private Double perWet;
@Column(name = "PER_IMPURITY_")
- @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣�")
+ @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣旓紝榛樿涓虹┖锛屾潵婧愯川妫�淇℃伅")
private Double perImpurity;
@Column(name = "BULK_WEIGHT_")
@@ -116,29 +117,25 @@
@PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
private String storeKeeperName;
- @Column(name = "CHECK_DATE_")
- @PropertyDef(label = "妫�娴嬫椂闂�", description = "鏈�鍚庤川妫�鏃堕棿")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date checkDate;
-
@Column(name = "STORE_DATE_")
- @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "鍏ュ簱鏃堕棿")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "榛樿绌猴紝閫氳繃搴撳瓨鍙樻洿")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date storeDate;
- @Column(name = "FOOD_YEAR_", length = 10)
- @PropertyDef(label = "绮骞翠唤")
- private String foodYear;
+ @Column(name = "CHECK_DATE_")
+ @PropertyDef(label = "鏈�鍚庤川妫�鏃堕棿", description = "榛樿绌猴紝鏉ユ簮璐ㄦ淇℃伅")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date checkDate;
- @Column(name = "REMARK_", length = 250)
+ @Column(name = "REMARK_", length = 200)
@PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
private String remark;
- // ------------鍏朵粬灞炴�т俊鎭�------------//
- @Transient
- @PropertyDef(label = "褰撳墠鍙傝�冧笅璁惧淇℃伅")
- private List<Device> devices;
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+ // ------------鍏朵粬灞炴�т俊鎭�------------//
@Transient
@PropertyDef(label = "绮鍝佺")
private String foodVarietyName;
@@ -166,10 +163,6 @@
@Transient
@PropertyDef(label = "Y鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
private Double posY;
-
- @Transient
- @PropertyDef(label = "淇敼鏍囩")
- private String editTag;
public String getFoodLevelName() {
--
Gitblit v1.9.3