From 9483baffba9a24a2a36fc8739fc65b59317d9142 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 14:18:46 +0800
Subject: [PATCH] 队列拆分
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
index 8eaadbe..f4d9cbe 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
@@ -57,6 +57,7 @@
/**
* 浼樺厛绾�
+ * The large the value, the earlier it will be executed
*/
@ApiModelProperty(value= "浼樺厛绾�")
private Integer priority;
@@ -181,6 +182,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ public Action() {
+ }
+
public Action(String uuid, Long busId, Long taskId, String seqNum, Integer priority, String name, Double val, String code, String params, Long actionType, Long actionSts, Long agvId, Date ioTime) {
this.uuid = uuid;
this.busId = busId;
@@ -201,7 +205,7 @@
BusService service = SpringUtils.getBean(BusService.class);
Bus bus = service.getById(this.busId);
if (!Cools.isEmpty(bus)){
- return String.valueOf(bus.getUuid());
+ return String.valueOf(bus.getBusNo());
}
return null;
}
@@ -263,17 +267,18 @@
}
}
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
+ 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.deleted);
+ return null;
}
}
+
}
--
Gitblit v1.9.1