From 15b4f0733767ae5d8a74f3302c21d13eb4697b4f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 15:44:17 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
index 8037257..3b1b259 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
@@ -3,12 +3,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.zy.acs.manager.manager.service.CodeService;
-import com.zy.acs.manager.manager.service.StaStsService;
-import com.zy.acs.manager.manager.service.StaTypeService;
-import com.zy.acs.manager.manager.service.ZoneService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SpringUtils;
+import com.zy.acs.manager.manager.service.CodeService;
+import com.zy.acs.manager.manager.service.StaTypeService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -58,8 +56,20 @@
@ApiModelProperty(value= "鍋忕Щ閲�")
private Double offset;
+ @ApiModelProperty(value= "浣滀笟楂樺害")
+ private Double height;
+
+ @ApiModelProperty(value= "浣滀笟娣卞害")
+ private Double depth;
+
@ApiModelProperty(value= "浣滀笟瑙掑害")
private String angle;
+
+ @ApiModelProperty(value= "杩炵画鍏ュ簱绛夊緟(ms)")
+ private Integer inboundWait;
+
+ @ApiModelProperty(value= "杩炵画鍑哄簱绛夊緟(ms)")
+ private Integer outboundWait;
@ApiModelProperty(value= "鑷姩")
private String autoing;
@@ -103,40 +113,47 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public String getZoneId$(){
- ZoneService service = SpringUtils.getBean(ZoneService.class);
- Zone zone = service.getById(this.zoneId);
- if (!Cools.isEmpty(zone)){
- return String.valueOf(zone.getName());
- }
- return null;
- }
-
+// public String getZoneId$(){
+// ZoneService service = SpringUtils.getBean(ZoneService.class);
+// Zone zone = service.getById(this.zoneId);
+// if (!Cools.isEmpty(zone)){
+// return String.valueOf(zone.getName());
+// }
+// return null;
+// }
+//
public String getStaType$(){
StaTypeService service = SpringUtils.getBean(StaTypeService.class);
StaType staType = service.getById(this.staType);
if (!Cools.isEmpty(staType)){
- return String.valueOf(staType.getName());
+ return String.valueOf(staType.getUuid());
}
return null;
}
-
+//
public String getCode$(){
CodeService service = SpringUtils.getBean(CodeService.class);
- Code code = service.getById(this.code);
+ Code code = service.getCacheById(this.code);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
+//
+// public String getStaSts$(){
+// StaStsService service = SpringUtils.getBean(StaStsService.class);
+// StaSts staSts = service.getById(this.staSts);
+// if (!Cools.isEmpty(staSts)){
+// return String.valueOf(staSts.getName());
+// }
+// return null;
+// }
- public String getStaSts$(){
- StaStsService service = SpringUtils.getBean(StaStsService.class);
- StaSts staSts = service.getById(this.staSts);
- if (!Cools.isEmpty(staSts)){
- return String.valueOf(staSts.getName());
+ public Boolean getConnect() {
+ if (Cools.isEmpty(this.autoing)) {
+ return false;
}
- return null;
+ return this.autoing.equals("1");
}
public Boolean getStatusBool(){
--
Gitblit v1.9.1