From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 20 五月 2025 16:57:11 +0800
Subject: [PATCH] 新增充电桩
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java | 48 ++++++++----------------------------------------
1 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
index 4a47d07..9f7cb82 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
@@ -89,6 +89,12 @@
private Integer backpack;
/**
+ * 绠楁硶鑰楁椂
+ */
+ @ApiModelProperty(value= "绠楁硶鑰楁椂")
+ private Integer algoTime;
+
+ /**
* 杩涘害
*/
@ApiModelProperty(value= "杩涘害")
@@ -144,44 +150,6 @@
public Segment() {}
- public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,String state,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.travelId = travelId;
- this.taskId = taskId;
- this.agvId = agvId;
- this.serial = serial;
- this.startNode = startNode;
- this.endNode = endNode;
- this.state = state;
- this.status = status;
- this.deleted = deleted;
- this.tenantId = tenantId;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// Segment segment = new Segment(
-// null, // 缂栧彿
-// null, // 浠诲姟缁�
-// null, // 浠诲姟
-// null, // AGV
-// null, // 搴忓彿
-// null, // 璧峰鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 杩涘害
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
public String getTravelId$(){
TravelService service = SpringUtils.getBean(TravelService.class);
Travel travel = service.getById(this.travelId);
@@ -213,7 +181,7 @@
CodeService service = SpringUtils.getBean(CodeService.class);
Code code = service.getById(this.startNode);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
@@ -222,7 +190,7 @@
CodeService service = SpringUtils.getBean(CodeService.class);
Code code = service.getById(this.endNode);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
--
Gitblit v1.9.1