From 583b31d46bb8abbee7410d29ca229120ee589cba Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 10:10:08 +0800
Subject: [PATCH] # version merge
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java | 88 ++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 55 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
index f4f7e1f..df57d4f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
@@ -125,6 +125,18 @@
private String mqttTopic;
/**
+ * 鏂紑鍏呯數{1:鏄�,0:鍚
+ */
+ @ApiModelProperty(value= "鏂厖鍔ㄤ綔 1: 鏄� 0: 鍚� ")
+ private Integer needUndocking;
+
+ /**
+ * 鑳岀瘬鍔ㄤ綔 {1:鏄�,0:鍚
+ */
+ @ApiModelProperty(value= "鑳岀瘬鍔ㄤ綔 1: 鏄� 0: 鍚� ")
+ private Integer backupAction;
+
+ /**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
@@ -172,63 +184,29 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public AgvModel() {}
-
- public AgvModel(String uuid,String type,String name,Integer length,Integer width,Integer height,Integer liftHeight,Integer diameter,String password,Integer backpack,Integer lowBattery,Integer quaBattery,Integer travelSpeed,Double workDirection,Integer allDirection,String protocol,String mqttTopic,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.type = type;
- this.name = name;
- this.length = length;
- this.width = width;
- this.height = height;
- this.liftHeight = liftHeight;
- this.diameter = diameter;
- this.password = password;
- this.backpack = backpack;
- this.lowBattery = lowBattery;
- this.quaBattery = quaBattery;
- this.travelSpeed = travelSpeed;
- this.workDirection = workDirection;
- this.allDirection = allDirection;
- this.protocol = protocol;
- this.mqttTopic = mqttTopic;
- this.status = status;
- this.deleted = deleted;
- this.tenantId = tenantId;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
+ public Boolean getNeedUndockingBool(){
+ if (null == this.needUndocking){ return null; }
+ switch (this.needUndocking){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
}
-// AgvModel agvModel = new AgvModel(
-// null, // 缂栧彿
-// null, // 绫诲瀷
-// null, // 鍚嶇О
-// null, // 闀垮害
-// null, // 瀹藉害
-// null, // 楂樺害
-// null, // 涓惧崌楂樺害
-// null, // 鏃嬭浆鐩村緞
-// null, // 璁惧瀵嗙爜
-// null, // 鑳岀瘬
-// null, // 鏈�浣庣數閲�
-// null, // 棰濆畾鐢甸噺
-// null, // 璧拌閫熷害
-// null, // 浣滀笟鏂瑰悜
-// null, // 鍏ㄥ悜
-// null, // 鍗忚
-// null, // mqtt涓婚
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
+ public Boolean getBackupActionBool(){
+ if (null == this.backupAction){ return null; }
+ switch (this.backupAction){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
public Boolean getAllDirectionBool(){
if (null == this.allDirection){ return null; }
--
Gitblit v1.9.1