From 5e73881ef728238e7f7a3bd5d74cf41f3f6b0923 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java | 39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java
index 4605a33..741dde8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwDefenseSceneDTO.java
@@ -16,10 +16,12 @@
*/
package org.sxkj.fw.area.dto;
+import java.util.Date;
+import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 防控场景表 数据传输对象实体类
@@ -28,13 +30,14 @@
* @since 2026-01-07
*/
@Data
-public class FwDefenseSceneDTO {
+public class FwDefenseSceneDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ApiModelProperty(value = "主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 场景名称
@@ -46,31 +49,6 @@
*/
@ApiModelProperty(value = "场景类型：核心区/学校等")
private String sceneType;
- /**
- * 指挥点经度
- */
- @ApiModelProperty(value = "指挥点经度")
- private Double longitude;
- /**
- * 指挥点纬度
- */
- @ApiModelProperty(value = "指挥点纬度")
- private Double latitude;
- /**
- * 防控负责人
- */
- @ApiModelProperty(value = "防控负责人")
- private String defenseLeader;
- /**
- * 防控负责人电话
- */
- @ApiModelProperty(value = "防控负责人电话")
- private String leaderPhone;
- /**
- * 防控面积(m)
- */
- @ApiModelProperty(value = "防控面积(m)")
- private Integer defenseArea;
/**
* 设备模式
*/
@@ -121,4 +99,9 @@
*/
@ApiModelProperty(value = "删除标志（0存在 1删除）")
private Integer isDeleted;
+
+
+
+
+
}
--
Gitblit v1.9.3