From bfe51f9c2ce2181fee372ed5f9017c7af59cc896 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 01 九月 2025 12:49:55 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 86 ++++++++++++------------------------------
1 files changed, 25 insertions(+), 61 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..bb201a6 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
@@ -56,7 +56,7 @@
* 绔欑被鍨�
*/
@ApiModelProperty(value= "绔欑被鍨�")
- private Long staType;
+ private Integer staType;
/**
* 鏉＄爜
@@ -69,6 +69,12 @@
*/
@ApiModelProperty(value= "鍋忕Щ閲�")
private Double offset;
+
+ /**
+ * 浣滀笟瑙掑害
+ */
+ @ApiModelProperty(value= "浣滀笟瑙掑害")
+ private String angle;
/**
* 鑷姩
@@ -122,13 +128,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -140,7 +146,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -153,56 +159,6 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
- public Sta() {}
-
- 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);
@@ -220,6 +176,15 @@
return String.valueOf(staType.getName());
}
return null;
+ }
+
+ public Integer getStaTypeIsCheck(){
+ StaTypeService service = SpringUtils.getBean(StaTypeService.class);
+ StaType staType = service.getById(this.staType);
+ if (!Cools.isEmpty(staType)){
+ return staType.getCheckType();
+ }
+ return 0;
}
public String getCode$(){
@@ -252,17 +217,16 @@
}
}
- 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