From 29aa7746640d7d0c0f01f3e0d3f23ef3250086a7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 13 六月 2025 16:50:39 +0800
Subject: [PATCH] 数据为空的校验补充
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java | 84 +++++++++++++----------------------------
1 files changed, 27 insertions(+), 57 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 417eab2..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
@@ -8,6 +8,7 @@
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.TaskService;
+import com.zy.acs.manager.manager.service.TravelService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -88,6 +89,12 @@
private Integer backpack;
/**
+ * 绠楁硶鑰楁椂
+ */
+ @ApiModelProperty(value= "绠楁硶鑰楁椂")
+ private Integer algoTime;
+
+ /**
* 杩涘害
*/
@ApiModelProperty(value= "杩涘害")
@@ -109,13 +116,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -127,7 +134,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -143,43 +150,14 @@
public Segment() {}
- public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,String state,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer 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;
+ public String getTravelId$(){
+ TravelService service = SpringUtils.getBean(TravelService.class);
+ Travel travel = service.getById(this.travelId);
+ if (!Cools.isEmpty(travel)){
+ return String.valueOf(travel.getUuid());
+ }
+ return null;
}
-
-// Segment segment = new Segment(
-// null, // 缂栧彿
-// null, // 浠诲姟缁�
-// null, // 浠诲姟
-// null, // AGV
-// null, // 搴忓彿
-// null, // 璧峰鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 杩涘害
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
public String getTaskId$(){
TaskService service = SpringUtils.getBean(TaskService.class);
@@ -203,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;
}
@@ -212,34 +190,26 @@
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;
}
- public String getStatus$(){
+ public Boolean getStatusBool(){
if (null == this.status){ return null; }
switch (this.status){
case 1:
- return "姝ｅ父";
+ return true;
case 0:
- return "鍐荤粨";
+ return false;
default:
- return String.valueOf(this.status);
+ return null;
}
}
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
+ public String getSegDesc() {
+
+ return "";
}
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1