From f5560820431163db68ccea4c850fb90a0eebf467 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:42:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPointSituationReport.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPointSituationReport.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPointSituationReport.java
index 0d3857d..135486b 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPointSituationReport.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPointSituationReport.java
@@ -32,7 +32,19 @@
*/
@ApiModelProperty("现场情况（1=正常，2=异常）")
@TableField("field_situation")
- private String fieldSituation;
+ private Integer fieldSituation;
+
+ public String getFieldSituationName() {
+ if(fieldSituation != null){
+ if(fieldSituation == 1){
+ return "正常";
+ }else if(fieldSituation == 2){
+ return "异常";
+ }
+ }
+ return "";
+ }
+
/**
* 现场照片JSON数组
*/
@@ -53,6 +65,7 @@
/**
* 现场情况上报时间
*/
+ @ApiModelProperty("现场情况上报时间")
@TableField("reporting_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime reportingTime;
--
Gitblit v1.7.1