From d9969f509099240514f10421c6cfad4d914b7b7c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 12 Jan 2026 15:45:29 +0800
Subject: [PATCH] 数据驾驶舱优化

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwTaskScheduleDTO.java |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwTaskScheduleDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwTaskScheduleDTO.java
index c36bfa5..03d836c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwTaskScheduleDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwTaskScheduleDTO.java
@@ -16,9 +16,14 @@
  */
 package org.sxkj.fw.detection.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 任务调度记录表 数据传输对象实体类
@@ -27,8 +32,69 @@
  * @since 2026-01-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class FwTaskScheduleDTO extends FwTaskScheduleEntity {
+public class FwTaskScheduleDTO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 设备ID(ja_fw_device.id)
+	 */
+	@ApiModelProperty(value = "设备ID(ja_fw_device.id)")
+	private Long deviceId;
+	/**
+	 * 关联区域ID
+	 */
+	@ApiModelProperty(value = "关联区域ID")
+	private Long areaDivideId;
+	/**
+	 * 关联场景ID
+	 */
+	@ApiModelProperty(value = "关联场景ID")
+	private Long defenseSceneId;
+	/**
+	 * 调度经度
+	 */
+	@ApiModelProperty(value = "调度经度")
+	private Double longitude;
+	/**
+	 * 调度纬度
+	 */
+	@ApiModelProperty(value = "调度纬度")
+	private Double latitude;
+	/**
+	 * 调度人员
+	 */
+	@ApiModelProperty(value = "调度人员")
+	private String dispatchUser;
+	/**
+	 * 调度日期-开始
+	 */
+	@ApiModelProperty(value = "调度日期-开始")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date dispatchStartTime;
+	/**
+	 * 调度日期-结束
+	 */
+	@ApiModelProperty(value = "调度日期-结束")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date dispatchEndTime;
+	/**
+	 * 调度内容
+	 */
+	@ApiModelProperty(value = "调度内容")
+	private String dispatchContent;
+	/**
+	 * 调度结果
+	 */
+	@ApiModelProperty(value = "调度结果")
+	private String dispatchResult;
+	/**
+	 * 处置措施
+	 */
+	@ApiModelProperty(value = "处置措施")
+	private String disposeMeasure;
+	/**
+	 * 区域编码
+	 */
+	@ApiModelProperty(value = "区域编码")
+	private String areaCode;
 }

--
Gitblit v1.9.3