From f7f44b007f6d75dc1b6446f083123e39d78a9806 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:17:45 +0800
Subject: [PATCH] feat(workorder): 添加任务结果中的事件名称字段
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java | 73 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
index 897633e..2e7925c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
@@ -16,14 +16,14 @@
*/
package org.sxkj.gd.workorder.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 巡查任务表 视图实体类
@@ -32,7 +32,7 @@
* @since 2026-01-14
*/
@Data
-public class GdPatrolTaskVO {
+public class GdPatrolTaskVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "成果数量")
@@ -43,6 +43,9 @@
@ApiModelProperty(value = "工单名称")
private String workOrderName;
+
+ @ApiModelProperty(value = "工单状态")
+ private String workOrderStatus;
/**
* 关联工单任务表ID
@@ -63,13 +66,17 @@
/**
* 巡查任务类型（巡查类/安检类等）
*/
- @ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
- private String patrolTaskType;
+ @ApiModelProperty(value = "巡查任务类型（二维数组，如：[[\"road\",\"road1\"],[\"bridge\",\"bridge2\"]]）")
+ private List<List<String>> patrolTaskType;
/**
* 执行时间
*/
@ApiModelProperty(value = "执行时间")
private Date executeTime;
+
+ @ApiModelProperty(value = "巡查任务航线ID")
+ private String airlineId;
+
/**
* 巡查任务航线URL
*/
@@ -80,11 +87,17 @@
*/
@ApiModelProperty(value = "推荐飞手名称")
private String recommendFlyerName;
+
+ @ApiModelProperty(value = "设备飞手ID")
+ private String deviceFlyerId;
/**
* 关联设备ID
*/
@ApiModelProperty(value = "关联设备ID")
private Long deviceId;
+
+ @ApiModelProperty(value = "设备名称")
+ private String deviceName;
/**
* 任务描述
*/
@@ -95,6 +108,13 @@
*/
@ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
private String taskStatus;
+
+ /**
+ * 拒绝原因（审核拒绝时必填）
+ */
+ @ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+ private String rejectReason;
+
/**
* 区域编码
*/
@@ -102,34 +122,43 @@
private String areaCode;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建人")
+ @ApiModelProperty(value = "创建人")
private Long createUser;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建部门")
+ @ApiModelProperty(value = "创建部门")
private Long createDept;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("更新人")
+ @ApiModelProperty(value = "更新人")
private Long updateUser;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("更新时间")
+ @ApiModelProperty(value = "更新时间")
private Date updateTime;
- @ApiModelProperty("业务状态")
+ @ApiModelProperty(value = "状态")
private Integer status;
- @ApiModelProperty("是否已删除")
+ @ApiModelProperty(value = "逻辑删除")
private Integer isDeleted;
+ @ApiModelProperty(value = "机场id")
+ private String airportId;
+
+ @ApiModelProperty(value = "高度")
+ private String height;
+
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ @ApiModelProperty("算法ids")
+ private List<String> algorithmIds;
+
}
--
Gitblit v1.9.3