From 94c6d9bec3103526631e03d0e24afea0b23e26a5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 13:15:16 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
index a024422..c7d4d49 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SpringUtils;
-import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +14,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.Optional;
@Data
@TableName("man_agv_detail")
@@ -345,13 +346,9 @@
this.agvStatus = AgvStatusType.get(status);
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- if (null == this.agvStatus){ return null; }
- return this.agvStatus.desc;
+ public String getStatusDesc(){
+ return Optional.ofNullable(this.agvStatus).map(status -> status.desc).orElse("");
}
-
-
public Long getRecentCode() {
// if (this.code != null) {
@@ -368,19 +365,5 @@
}
return null;
}
-
- 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