From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/ElectronicPageListQuery.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/ElectronicPageListQuery.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/ElectronicPageListQuery.java
index 29ace33..89757e2 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/ElectronicPageListQuery.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/operation/ElectronicPageListQuery.java
@@ -1,19 +1,28 @@
package com.xiaopeng.api.query.operation;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xiaopeng.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
import java.util.List;
@Data
@ApiModel(value = "电子围栏列表查询query")
public class ElectronicPageListQuery extends BasePage {
+ @ApiModelProperty(value = "城市编码")
+ private String cityCode;
+
@ApiModelProperty(value = "围栏id/名称")
private String electronicNumberOrName;
- @ApiModelProperty(value = "围栏构成 区域id")
+ @ApiModelProperty(value = "禁行区数量筛选：范围（如 0,5）或阈值（如 20 表示>20）")
private String electronicAreaId;
+ @ApiModelProperty(value = "禁行区数量范围-最小值（由后端从 electronicAreaId 解析或前端直传）")
+ private Integer prohibitedAreaCountMin;
+ @ApiModelProperty(value = "禁行区数量范围-最大值（由后端从 electronicAreaId 解析或前端直传）")
+ private Integer prohibitedAreaCountMax;
@ApiModelProperty(value = "围栏状态 0=草稿 1=待启用 2=启用中 3=已停用")
private List<Integer> statusList;
@ApiModelProperty(value = "创建人")
@@ -29,7 +38,17 @@
@ApiModelProperty(value = "更新结束时间")
private String updateEndTime;
@ApiModelProperty(value = "开始时间 1正序 2倒序")
- private String createSort;
+ private Integer createSort;
@ApiModelProperty(value = "更新时间 1正序 2倒序")
- private String updateSort;
+ private Integer updateSort;
+
+
+ @ApiModelProperty(value = "生效时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime effectTime;
+
+ @ApiModelProperty(value = "失效时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime failureTime;
+
}
--
Gitblit v1.7.1