From 89fd0b6ff97e90220376cec824eaf8eabb9d0a3e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 04 Aug 2026 08:18:45 +0800
Subject: [PATCH] refactor(GdClueEventService): 优化线索事件查询逻辑
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdPatrolTaskDTO.java | 74 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdPatrolTaskDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdPatrolTaskDTO.java
index bd14d29..bb3d890 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdPatrolTaskDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdPatrolTaskDTO.java
@@ -16,9 +16,12 @@
*/
package org.sxkj.gd.workorder.dto;
-import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 巡查任务表 数据传输对象实体类
@@ -27,8 +30,69 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdPatrolTaskDTO extends GdPatrolTaskEntity {
- private static final long serialVersionUID = 1L;
+public class GdPatrolTaskDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 关联工单任务表ID
+ */
+ @ApiModelProperty(value = "关联工单任务表ID")
+ private Long workOrderId;
+
+ /**
+ * 巡查任务编号
+ */
+ @ApiModelProperty(value = "巡查任务编号")
+ private String taskNo;
+ /**
+ * 巡查任务名称
+ */
+ @ApiModelProperty(value = "巡查任务名称")
+ private String patrolTaskName;
+ /**
+ * 巡查任务类型（巡查类/安检类等）
+ */
+ @ApiModelProperty(value = "巡查任务类型 1.巡查类 2.巡检类 3.安保类 4.文旅类 5.采集数据类 ")
+ private String patrolTaskType;
+ /**
+ * 执行时间
+ */
+ @ApiModelProperty(value = "执行时间")
+ private Date executeTime;
+ /**
+ * 巡查任务航线URL
+ */
+ @ApiModelProperty(value = "巡查任务航线URL")
+ private String patrolRouteUrl;
+ /**
+ * 推荐飞手名称
+ */
+ @ApiModelProperty(value = "推荐飞手名称")
+ private String recommendFlyerName;
+ /**
+ * 关联设备ID
+ */
+ @ApiModelProperty(value = "关联设备ID")
+ private Long deviceId;
+ /**
+ * 任务描述
+ */
+ @ApiModelProperty(value = "任务描述")
+ private String taskDesc;
+ /**
+ * 状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过
+ */
+ @ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
+ private String taskStatus;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
}
--
Gitblit v1.9.3