From 1c6befe06b8a19dd5da1e34fc667d45be1597bb7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 19 七月 2025 18:31:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasLift.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLift.java b/src/main/java/com/zy/asrs/entity/BasLift.java
index a72cefb..7f8317c 100644
--- a/src/main/java/com/zy/asrs/entity/BasLift.java
+++ b/src/main/java/com/zy/asrs/entity/BasLift.java
@@ -5,9 +5,10 @@
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;
@@ -17,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")
@@ -88,6 +90,13 @@
@TableField("point")
private String point;
+ /**
+ * 鎻愬崌鏈虹珯鐐�
+ */
+ @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, String deviceStatus) {
@@ -117,11 +126,15 @@
return null;
}
- public NyShuttleProtocol.NyShuttlePointClass getPoint$() {
- if (Cools.isEmpty(this.point)){
- return null;
+ public List<LiftStation> getStationList$(){
+ List<LiftStation> list = new ArrayList<>();
+ if (Cools.isEmpty(this.stationList)){
+ return list;
}
- return JSON.parseObject(this.point, NyShuttleProtocol.NyShuttlePointClass.class);
+
+ List<LiftStation> liftStations = JSON.parseArray(stationList, LiftStation.class);
+ list.addAll(liftStations);
+ return list;
}
}
--
Gitblit v1.9.1