From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 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 7d66c57..2264979 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;
@@ -181,6 +182,15 @@
// null // 澶囨敞
// );
+ 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;
+ }
+
public String getTaskId$(){
TaskService service = SpringUtils.getBean(TaskService.class);
Task task = service.getById(this.taskId);
@@ -203,7 +213,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 +222,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