From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java | 79 ++++++---------------------------------
1 files changed, 13 insertions(+), 66 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 5904324..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;
@@ -149,13 +150,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -167,7 +168,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -181,34 +182,7 @@
@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,Date startTime,Date endTime,Date errTime,String errDesc,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.busId = busId;
- this.taskId = taskId;
- this.seqNum = seqNum;
- this.priority = priority;
- this.name = name;
- this.val = val;
- this.code = code;
- this.params = params;
- this.actionType = actionType;
- this.actionSts = actionSts;
- this.agvId = agvId;
- this.ioTime = ioTime;
- this.startTime = startTime;
- this.endTime = endTime;
- this.errTime = errTime;
- this.errDesc = errDesc;
- 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 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) {
@@ -227,39 +201,11 @@
this.ioTime = ioTime;
}
- // Action action = new Action(
-// null, // 缂栧彿
-// null, // 鎬荤嚎
-// null, // 浠诲姟
-// null, // 鍔ㄤ綔鍙�
-// null, // 浼樺厛绾�
-// null, // 鍚嶇О
-// null, // 灞炴�у��
-// null, // 鍦伴潰鐮�
-// null, // 鍔ㄤ綔鍙傛暟
-// null, // 鍔ㄤ綔绫诲瀷
-// null, // 鍔ㄤ綔杩涘害
-// null, // AGV
-// null, // 宸ヤ綔鏃堕棿
-// null, // 寮�濮嬫椂闂�
-// null, // 缁撴潫鏃堕棿
-// null, // 寮傚父鏃堕棿
-// null, // 寮傚父鎻忚堪
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
public String getBusId$(){
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;
}
@@ -321,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