From 071cd79b24a943ba764448adc07c416bb55ca3ba Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 10:53:18 +0800
Subject: [PATCH] fix(gd): 移除用户部门关联查询中的软删除条件
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 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 c092427..a398c29 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,11 +16,15 @@
*/
package org.sxkj.gd.workorder.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
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;
/**
* 设备信息 视图实体类
@@ -34,7 +38,14 @@
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;
@@ -43,6 +54,12 @@
*/
@ApiModelProperty(value = "设备名称")
private String nickname;
+
+ /**
+ * 设备状态：{0:"在线",1:"离线"}
+ */
+ @ApiModelProperty(value = "设备状态：{0:在线,1:离线}")
+ private Long modeCode;
/**
* 设备负载（红外，喇叭，闪光灯）
@@ -61,7 +78,41 @@
private Double latitude;
@ApiModelProperty(value = "设备ids")
- private List<Integer> deviceIds;
+ 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;
+
+ /**
+ * 设备维护状态{0:无需保养,1:待保养,2:正在保养}
+ */
+ @ApiModelProperty(value = "设备维护状态{0:无需保养,1:待保养,2:正在保养}")
+ private Integer maintenanceState;
}
--
Gitblit v1.9.3