From 3c45d4f9f3aba5bc85a9577e43c0dffc71b93a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 10 七月 2025 15:54:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasLift.java | 149 +++++++++----------------------------------------
1 files changed, 28 insertions(+), 121 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java
index 2cddf57..7f8317c 100644
--- a/src/main/java/com/zy/asrs/entity/BasLift.java
+++ b/src/main/java/com/zy/asrs/entity/BasLift.java
@@ -1,12 +1,14 @@
package com.zy.asrs.entity;
+import com.alibaba.fastjson.JSON;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
-import com.zy.core.model.protocol.NyShuttleProtocol;
+import com.zy.core.model.LiftStation;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -16,6 +18,7 @@
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.util.List;
@Data
@TableName("asr_bas_lift")
@@ -74,120 +77,29 @@
private Boolean pakMk;
/**
+ * 璁惧鐘舵��
+ */
+ @ApiModelProperty(value= "璁惧鐘舵��")
+ @TableField("device_status")
+ private String deviceStatus;
+
+ /**
* 鎻愬崌鏈哄潗鏍�
*/
@ApiModelProperty(value= "鎻愬崌鏈哄潗鏍�")
@TableField("point")
- private NyShuttleProtocol.NyShuttlePointClass point;
+ private String point;
/**
- * 妯″紡
+ * 鎻愬崌鏈虹珯鐐�
*/
- @ApiModelProperty(value= "妯″紡")
- @TableField("model")
- private Boolean model;
-
- /**
- * 蹇欓棽
- */
- @ApiModelProperty(value= "蹇欓棽")
- @TableField("busy")
- private Boolean busy;
-
- /**
- * 鍓嶈秴闄�
- */
- @ApiModelProperty(value= "鍓嶈秴闄�")
- @TableField("front_overrun")
- private Boolean frontOverrun;
-
- /**
- * 鍚庤秴闄�
- */
- @ApiModelProperty(value= "鍚庤秴闄�")
- @TableField("back_overrun")
- private Boolean backOverrun;
-
- /**
- * 宸﹁秴闄�
- */
- @ApiModelProperty(value= "宸﹁秴闄�")
- @TableField("left_overrun")
- private Boolean leftOverrun;
-
- /**
- * 鍙宠秴闄�
- */
- @ApiModelProperty(value= "鍙宠秴闄�")
- @TableField("right_overrun")
- private Boolean rightOverrun;
-
- /**
- * 瓒呴珮
- */
- @ApiModelProperty(value= "瓒呴珮")
- @TableField("over_height")
- private Boolean overHeight;
-
- /**
- * 瓒呴噸
- */
- @ApiModelProperty(value= "瓒呴噸")
- @TableField("over_weight")
- private Boolean overWeight;
-
- /**
- * 鏈夋墭鐩�
- */
- @ApiModelProperty(value= "鏈夋墭鐩�")
- @TableField("has_tray")
- private Boolean hasTray;
-
- /**
- * 鏈夊皬杞�
- */
- @ApiModelProperty(value= "鏈夊皬杞�")
- @TableField("has_car")
- private Boolean hasCar;
-
- /**
- * 璁惧鏁呴殰
- */
- @ApiModelProperty(value= "璁惧鏁呴殰")
- @TableField("device_error")
- private Boolean deviceError;
-
- /**
- * 浠诲姟鍦板潃
- */
- @ApiModelProperty(value= "浠诲姟鍦板潃")
- @TableField("task_address")
- private Integer taskAddress;
-
- /**
- * 鐩殑鍦板潃
- */
- @ApiModelProperty(value= "鐩殑鍦板潃")
- @TableField("dist_address")
- private Integer distAddress;
-
- /**
- * 宸插畬鎴愪换鍔″彿
- */
- @ApiModelProperty(value= "宸插畬鎴愪换鍔″彿")
- @TableField("complete_task_no")
- private Integer completeTaskNo;
-
- /**
- * 妤煎眰
- */
- @ApiModelProperty(value= "妤煎眰")
- @TableField("lev")
- private Integer lev;
+ @ApiModelProperty(value= "鎻愬崌鏈虹珯鐐�")
+ @TableField("station_list")
+ private String stationList;
public BasLift() {}
- public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Boolean pakMk, NyShuttleProtocol.NyShuttlePointClass point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) {
+ public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Boolean pakMk, String deviceStatus) {
this.liftNo = liftNo;
this.status = status;
this.wrkNo = wrkNo;
@@ -195,22 +107,7 @@
this.updateBy = updateBy;
this.memo = memo;
this.pakMk = pakMk;
- this.point = point;
- this.model = model;
- this.busy = busy;
- this.frontOverrun = frontOverrun;
- this.backOverrun = backOverrun;
- this.leftOverrun = leftOverrun;
- this.rightOverrun = rightOverrun;
- this.overHeight = overHeight;
- this.overWeight = overWeight;
- this.hasTray = hasTray;
- this.hasCar = hasCar;
- this.deviceError = deviceError;
- this.taskAddress = taskAddress;
- this.distAddress = distAddress;
- this.completeTaskNo = completeTaskNo;
- this.lev = lev;
+ this.deviceStatus = deviceStatus;
}
public String getUpdateTime$(){
@@ -229,5 +126,15 @@
return null;
}
+ public List<LiftStation> getStationList$(){
+ List<LiftStation> list = new ArrayList<>();
+ if (Cools.isEmpty(this.stationList)){
+ return list;
+ }
+
+ List<LiftStation> liftStations = JSON.parseArray(stationList, LiftStation.class);
+ list.addAll(liftStations);
+ return list;
+ }
}
--
Gitblit v1.9.1