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/model/maintenance/XpTask.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java
index 58124d2..ec4a754 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java
@@ -1,8 +1,7 @@
package com.xiaopeng.api.model.maintenance;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,9 +12,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -28,7 +25,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@TableName("xp_task")
+@TableName(value = "xp_task", autoResultMap = true)
@ApiModel(value = "XpTask对象", description = "任务管理")
public class XpTask extends BaseModel {
@@ -37,6 +34,9 @@
@ApiModelProperty(value = "自增id")
@TableId(value = "id", type = IdType.NONE)
private Long id;
+
+ @ApiModelProperty(value = "事故类型id")
+ private String errorTypeId;
@ApiModelProperty(value = "任务编号")
private String taskCode;
@@ -57,6 +57,7 @@
private String taskImage;
@ApiModelProperty(value = "车辆id")
+ @TableField(updateStrategy = FieldStrategy.NEVER)
private Long vehicleId;
@ApiModelProperty(value = "车辆位置")
private String vehicleLocation;
@@ -92,8 +93,48 @@
@ApiModelProperty(value = "是否已发送过期通知 0=未发送 1=已发送")
private Integer expiredNoticeSent;
- @ApiModelProperty(value = "状态 0=待到达 1=待处理 2=已完成 3=已取消")
+ @ApiModelProperty(value = "事故即将超时通知是否已发送 0=未发送 1=已发送")
+ private Integer willTimeoutNoticeSent;
+
+ @ApiModelProperty(value = "状态 0=待到达 1=待处理 2=已完成 3=已取消 4=改派中")
private Integer status;
+ @ApiModelProperty(value = "状态 2=已处理 1=改派中")
+ private Integer reassignmentStatus;
+ @ApiModelProperty(value = "任务来源 1-运维APP 2-管理后台 3-远程代驾")
+ private Integer taskSource;
+
+ @ApiModelProperty(value = "申请改派的用户")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<Reject> excluded;
+
+
+ public Reject reject(String msg) {
+ Reject reject = new Reject();
+ reject.setRejectTime(LocalDateTime.now().toString());
+ reject.setRejectUserId(handleUserId);
+ reject.setRejectReason(msg);
+ return reject;
+ }
+ @Data
+ public static class Reject {
+
+ @ApiModelProperty(value = "拒绝原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "拒绝时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String rejectTime;
+
+ @ApiModelProperty(value = "拒绝人id")
+ private String rejectUserId;
+
+ @ApiModelProperty(value = "拒绝人姓名")
+ private String rejectUserName;
+
+
+ @ApiModelProperty(value = "拒绝人角色名称")
+ private String rejectUserRoleName;
+ }
}
--
Gitblit v1.7.1