From 08d4bb2bf4bfadc9ab5fcf6b0a2bfb543d22b2a0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:13:10 +0800
Subject: [PATCH] 工单优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java
index 61657a7..15cf8d4 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java
@@ -16,9 +16,15 @@
*/
package org.sxkj.gd.workorder.vo;
-import org.sxkj.gd.workorder.entity.GdManageDeviceEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 设备信息 视图实体类
@@ -27,8 +33,79 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdManageDeviceVO extends GdManageDeviceEntity {
+public class GdManageDeviceVO implements Serializable {
+
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 设备编码
+ */
+ @ApiModelProperty(value = "设备编码")
+ private String deviceSn;
+
+ @ApiModelProperty(value = "设备型号")
+ private String deviceName;
+ /**
+ * custom name of the device
+ */
+ @ApiModelProperty(value = "设备名称")
+ private String nickname;
+
+ /**
+ * 设备状态：{0:"在线",1:"离线"}
+ */
+ @ApiModelProperty(value = "设备状态：{0:在线,1:离线}")
+ private Long modeCode;
+
+ /**
+ * 设备负载（红外，喇叭，闪光灯）
+ */
+ @ApiModelProperty(value = "设备负载（红外，喇叭，闪光灯）")
+ private String devicePayload;
+ /**
+ * 当前经度
+ */
+ @ApiModelProperty(value = "当前经度")
+ private Double longitude;
+ /**
+ * 当前纬度
+ */
+ @ApiModelProperty(value = "当前纬度")
+ private Double latitude;
+
+ @ApiModelProperty(value = "设备ids")
+ private List<String> deviceIds;
+
+ @ApiModelProperty(value = "设备范围")
+ private String geom;
+
+ @ApiModelProperty(value = "5公里范围面数据")
+ private String fiveKmArea;
+
+ @ApiModelProperty(value = "设备位置")
+ private String location;
+
+ @ApiModelProperty(value = "设备部门")
+ private String deviceDeptName;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 设备类型（0机场，1无人机）
+ */
+ @ApiModelProperty(value = "设备类型（0机场,1无人机）")
+ private Integer deviceType;
+
+ @ApiModelProperty(value = "固件版本")
+ private String firmwareVersion;
+
+ @ApiModelProperty(value = "设备高度")
+ private Double height;
+
}
--
Gitblit v1.9.3