From efabc6ba991acfd01d38bb0bf4e8cfd772416617 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 13:07:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 234 +++++++++++++++-------------------------------------------
1 files changed, 61 insertions(+), 173 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 28f76b5..8347a1f 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,7 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,248 +16,141 @@
private static final long serialVersionUID = 1L;
- /**
- * ID
- */
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 缂栧彿
- */
@ApiModelProperty(value= "缂栧彿")
private String uuid;
- /**
- * 搴撳尯
- */
@ApiModelProperty(value= "搴撳尯")
private Long zoneId;
- /**
- * 绔欏彿
- */
@ApiModelProperty(value= "绔欏彿")
private String staNo;
- /**
- * 鍚嶇О
- */
@ApiModelProperty(value= "鍚嶇О")
private String name;
- /**
- * 绔欑被鍨�
- */
@ApiModelProperty(value= "绔欑被鍨�")
private Long staType;
- /**
- * 鏉＄爜
- */
@ApiModelProperty(value= "鏉＄爜")
private Long code;
- /**
- * 鍋忕Щ閲�
- */
+ @ApiModelProperty(value= "妲戒綅鏁�")
+ private Integer capacity;
+
+ @ApiModelProperty(value= "鍗犵敤鏁�")
+ private Integer occCnt;
+
+ @ApiModelProperty(value= "棰勭害鏀捐揣閲�")
+ private Integer rsvInCnt;
+
+ @ApiModelProperty(value= "棰勭害鍙栬揣閲�")
+ private Integer rsvOutCnt;
+
@ApiModelProperty(value= "鍋忕Щ閲�")
private Double offset;
- /**
- * 鑷姩
- */
+ @ApiModelProperty(value= "浣滀笟瑙掑害")
+ private String angle;
+
@ApiModelProperty(value= "鑷姩")
private String autoing;
- /**
- * 鏈夌墿
- */
@ApiModelProperty(value= "鏈夌墿")
private String loading;
- /**
- * 鍙叆
- */
@ApiModelProperty(value= "鍙叆")
private String inEnable;
- /**
- * 鍙嚭
- */
@ApiModelProperty(value= "鍙嚭")
private String outEnable;
- /**
- * 鎵樼洏鐮�
- */
@ApiModelProperty(value= "鎵樼洏鐮�")
private String zpallet;
- /**
- * 绔欑姸鎬�
- */
@ApiModelProperty(value= "绔欑姸鎬�")
private Long staSts;
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
- */
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
private Integer deleted;
- /**
- * 绉熸埛
- */
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
- /**
- * 娣诲姞浜哄憳
- */
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
- /**
- * 娣诲姞鏃堕棿
- */
@ApiModelProperty(value= "娣诲姞鏃堕棿")
private Date createTime;
- /**
- * 淇敼浜哄憳
- */
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
- /**
- * 淇敼鏃堕棿
- */
@ApiModelProperty(value= "淇敼鏃堕棿")
private Date updateTime;
- /**
- * 澶囨敞
- */
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public Sta() {}
+// 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 null;
+// }
+//
+// public String getCode$(){
+// CodeService service = SpringUtils.getBean(CodeService.class);
+// Code code = service.getById(this.code);
+// if (!Cools.isEmpty(code)){
+// return String.valueOf(code.getUuid());
+// }
+// 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 Sta(String uuid,Long zoneId,String staNo,String name,Long staType,Long code,Double offset,String autoing,String loading,String inEnable,String outEnable,String zpallet,Long staSts,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.zoneId = zoneId;
- this.staNo = staNo;
- this.name = name;
- this.staType = staType;
- this.code = code;
- this.offset = offset;
- this.autoing = autoing;
- this.loading = loading;
- this.inEnable = inEnable;
- this.outEnable = outEnable;
- this.zpallet = zpallet;
- this.staSts = staSts;
- this.status = status;
- this.deleted = deleted;
- this.tenantId = tenantId;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// Sta sta = new Sta(
-// null, // 缂栧彿
-// null, // 搴撳尯
-// null, // 绔欏彿
-// null, // 鍚嶇О
-// null, // 绔欑被鍨媅闈炵┖]
-// null, // 鏉＄爜
-// null, // 鍋忕Щ閲�
-// null, // 鑷姩
-// null, // 鏈夌墿
-// null, // 鍙叆
-// null, // 鍙嚭
-// null, // 鎵樼洏鐮�
-// null, // 绔欑姸鎬�
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// 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());
+ public Boolean getConnect() {
+ if (Cools.isEmpty(this.autoing)) {
+ return false;
}
- return null;
+ return this.autoing.equals("1");
}
- 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 null;
- }
-
- public String getCode$(){
- CodeService service = SpringUtils.getBean(CodeService.class);
- Code code = service.getById(this.code);
- if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
- }
- 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 getStatus$(){
+ 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.status);
+ return null;
}
}
-
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
-
}
--
Gitblit v1.9.1