From 823155d38e3eccc3fef8fa15ba4bddc7479de997 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 27 二月 2026 21:51:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTaskRule.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTaskRule.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTaskRule.java
index 726ea7e..4608a73 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTaskRule.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTaskRule.java
@@ -4,9 +4,11 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xiaopeng.common.core.web.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -42,7 +44,8 @@
     private Integer vehicleInspectionFrequency;
 
     @ApiModelProperty(value = "车辆日常检测 任务下放时间")
-    private LocalDateTime vehicleInspectionTime;
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private LocalTime vehicleInspectionTime;
 
     @ApiModelProperty(value = "车辆日常监测 紧急程度 0=P0 1=P1 2=P2 3=P3")
     private Integer vehicleInspectionLevel;
@@ -51,7 +54,8 @@
     private Boolean vehicleCollection;
 
     @ApiModelProperty(value = "车辆收车每日时间")
-    private LocalDateTime vehicleCollectionTime;
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private LocalTime vehicleCollectionTime;
 
     @ApiModelProperty(value = "车辆保养周期是否启用")
     private Boolean maintenanceCycle;
@@ -63,7 +67,8 @@
     private Integer maintenanceCycleTimeType;
 
     @ApiModelProperty(value = "车辆保养周期 任务下放时间")
-    private LocalDateTime maintenanceCycleTaskTime;
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private LocalTime maintenanceCycleTaskTime;
 
     @ApiModelProperty(value = "车辆保养周期 紧急程度 0=P0 1=P1 2=P2 3=P3")
     private Integer maintenanceCycleLevel;
@@ -78,7 +83,11 @@
     private Integer chargingStrategyLevel;
 
     @ApiModelProperty(value = "车身清洁保养周期X")
-    private Integer vehicleCleanTime;
+    private Integer vehicleCleanCycle;
+
+    @ApiModelProperty(value = "车身清洁保养任务下放时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private LocalTime vehicleCleanTime;
 
     @ApiModelProperty(value = "车身清洁保养周期X 1=天 2=月")
     private Integer vehicleCleanTimeType;
@@ -87,7 +96,11 @@
     private Integer vehicleCleanLevel;
 
     @ApiModelProperty(value = "日常整备保养周期X")
-    private Integer routineMaintenanceTime;
+    private Integer routineMaintenanceCycle;
+
+    @ApiModelProperty(value = "日常整备保养任务下放时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private LocalTime routineMaintenanceTime;
 
     @ApiModelProperty(value = "日常整备保养周期X 1=天 2=月")
     private Integer routineMaintenanceTimeType;

--
Gitblit v1.7.1