From 20eb98994ee1c89eb4ef453037a48d5e357ade5c Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期五, 24 四月 2026 21:53:12 +0800
Subject: [PATCH] 1.围栏、点位、场站接口修改和添加 2.发送微信通知 优惠卷、活动、改派/车接单
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
index 7617222..1a3a837 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpPoint.java
@@ -6,6 +6,7 @@
import java.time.LocalDateTime;
import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.xiaopeng.common.core.web.domain.BaseModel;
@@ -69,7 +70,7 @@
@ApiModelProperty(value = "生效周期 1=“每日生效”、2=“仅工作日生效”、3=“仅非工作日生效”、4=“仅节假日生效”")
private Integer effectivePeriod;
- @ApiModelProperty(value = "生效时间段")
+ @ApiModelProperty(value = "自定义运营生效时间段")
private String effectiveTimePeriod;
@ApiModelProperty(value = "点位地址")
@@ -123,6 +124,7 @@
@TableField("district_code")
private String districtCode;
+
@ApiModelProperty(value = "所属场站id，为空表示运营区直属点位")
@TableField("station_id")
private Long stationId;
@@ -134,5 +136,46 @@
@ApiModelProperty(value = "点位上下车 1仅上车点/ 2 仅下车/ 3上下车均可")
private Integer pointOnOff;
+ public String getPointOnOffName() {
+ if(pointOnOff != null){
+ if(pointOnOff == 1){
+ return "仅上车点";
+ }else if(pointOnOff == 2){
+ return "仅下车点";
+ }else if(pointOnOff == 3){
+ return "上下车均可";
+ }
+ }
+ return "";
+ }
+
+
+ @ApiModelProperty(value = "电子围栏名称")
+ @TableField(exist = false)
+ private String electronicName;
+
+ @ApiModelProperty(value = "所属场站名称")
+ @TableField(exist = false)
+ private String stationName;
+
+ /**
+ * hover在状态标签时，展示信息
+ * - 已停用：展示停用原因；比如“因所属场站 [白云机场] 已关闭，该点位同步失效”
+ * - 测试不通过：展示不通过原因
+ * - 待生效：展示生效时间
+ */
+ @ApiModelProperty(value = "状态描述")
+ @TableField(exist = false)
+ private String hoverStatusDes;
+ @ApiModelProperty(value = "场站的生效时间")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime electronicEffectTime;
+
+ //[{"name": "策略组1", "time": ["04:00-10:00", "14:00-23:00"], "type": 0, "typeStr": []}]
+ @ApiModelProperty(value = "场站运营策略")
+ @TableField(exist = false)
+ private String electronicOperationStrategy;
+
}
--
Gitblit v1.7.1