From db0da79142146cd3de6e7fcca92dceeceb6d2665 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 04 九月 2025 13:42:27 +0800
Subject: [PATCH] 添加普通站点及下发任务站点管理功能

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index c204d8b..6481ea9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -7,6 +7,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.manager.enums.StationTypeEnum;
 import com.vincent.rsf.server.manager.service.WarehouseAreasService;
 import com.vincent.rsf.server.system.entity.DictData;
 import com.vincent.rsf.server.system.service.DictDataService;
@@ -44,6 +45,9 @@
      */
     @ApiModelProperty(value= "绔欑偣鍚嶇О")
     private String stationName;
+
+    @ApiModelProperty("绔欑偣绫诲瀷: {0:鍏夌數锛� 1:鏃犲厜鐢祡")
+    private Integer type;
 
     /**
      * 鍙叆
@@ -118,6 +122,10 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
+    private Integer deleted;
+
     /**
      * 鍒涘缓浜�
      */
@@ -144,6 +152,9 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @ApiModelProperty(value= "鐘舵��")
+    private Integer status;
+
     /**
      * 鎵�灞炴満鏋�
      */
@@ -158,27 +169,10 @@
 
     public BasStation() {}
 
-
-
-//    BasStation basStation = new BasStation(
-//            null,    // 绔欑偣鍚嶇О
-//            null,    // 鍙叆
-//            null,    // 鍙嚭
-//            null,    // 鐘舵��
-//            null,    // 鎵�灞炲簱鍖篿d
-//            null,    // 鏄惁鍙法鍖�
-//            null,    // 鍙法鍖哄尯鍩焛d
-//            null,    // 鏄惁wcs绔欑偣
-//            null,    // wcs绔欑偣淇℃伅
-//            null,    // 瀹瑰櫒绫诲瀷
-//            null,    // 鏉$爜
-//            null,    // 鏄惁鑷姩璋冩嫧
-//            null,    // 澶囨敞
-//            null,    // 鍒涘缓浜�
-//            null,    // 鍒涘缓鏃堕棿
-//            null,    // 鏇存柊浜�
-//            null    // 鏇存柊鏃堕棿
-//    );
+    public String getType$() {
+        if (this.type == null) return null;
+        return StationTypeEnum.getStationDesc(this.type);
+    }
 
     public List<Long> getContainerTypes$(){
         if (Cools.isEmpty(this.containerType)){
@@ -236,4 +230,17 @@
         }
         return null;
     }
+
+
+    public Boolean getStatusBool(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 1:
+                return true;
+            case 0:
+                return false;
+            default:
+                return null;
+        }
+    }
 }

--
Gitblit v1.9.1