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/Agv.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
index 460d046..b2cc14c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Agv.java
@@ -1,9 +1,6 @@
package com.zy.acs.manager.manager.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.manager.service.AgvStsService;
import com.zy.acs.framework.common.Cools;
@@ -62,22 +59,31 @@
private Integer deleted;
@ApiModelProperty(value = "绉熸埛[sys_tenant]")
- private Integer tenantId;
+ private Long tenantId;
@ApiModelProperty(value = "娣诲姞浜哄憳[sys_user]")
- private Integer createBy;
+ private Long createBy;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
@ApiModelProperty(value = "淇敼浜哄憳[sys_user]")
- private Integer updateBy;
+ private Long updateBy;
@ApiModelProperty(value = "淇敼鏃堕棿")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
private String memo;
+
+ @TableField(exist = false)
+ private AgvDetail agvDetail;
+
+ @TableField(exist = false)
+ private AgvModel agvModelData;
+
+ @TableField(exist = false)
+ private Boolean online = Boolean.FALSE;
public String getAgvSts$(){
AgvStsService service = SpringUtils.getBean(AgvStsService.class);
@@ -109,4 +115,17 @@
}
}
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+
}
--
Gitblit v1.9.1