From 66cf674e0f18a8bdc3dc45b080763edee910a2ab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 21 四月 2026 14:39:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpStation.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpStation.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpStation.java
index fd1d546..e1ed73c 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpStation.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpStation.java
@@ -12,6 +12,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -44,6 +45,33 @@
     @ApiModelProperty(value = "场站状态 0=草稿 1=待测试 2=测试中 3=测试不通过 4=可运营 5=待生效 6=启用中 7=已停用 8=失效")
     private Integer status;
 
+
+    public String getStatusName() {
+        if(status != null){
+            if(status == 0){
+                return "草稿";
+            }else if(status == 1){
+                return "待测试";
+            } else if(status == 2){
+                return "测试中";
+            }else if(status == 3){
+                return "测试未通过";
+            }else if(status == 4){
+                return "可运营";
+            }else if(status == 5){
+                return "待生效";
+            }else if(status == 6){
+                return "启用中";
+            }else if(status == 7){
+                return "已停用";
+            }else if(status == 8){
+                return "失效";
+            }
+        }
+        return "";
+    }
+
+
     @ApiModelProperty(value = "城市code")
     private String cityCode;
 
@@ -51,9 +79,11 @@
     private String cityName;
 
     @ApiModelProperty(value = "所属电子围栏id")
+    @NotNull(message = "所属电子围栏id不能为空")
     private Long electronicId;
 
     @ApiModelProperty(value = "所属运营区id")
+    @NotNull(message = "所属运营区id不能为空")
     private Long electronicAreaId;
 
     @ApiModelProperty(value = "默认展示点位id")

--
Gitblit v1.7.1