From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java | 88 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
index d0eeb27..4960103 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
@@ -16,6 +16,7 @@
*/
package org.sxkj.fw.device.vo;
+import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import org.sxkj.fw.device.entity.FwDeviceEntity;
@@ -23,6 +24,10 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.sxkj.system.cache.SysCache;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 设备表 视图实体类
@@ -32,10 +37,11 @@
*/
@Data
@Getter
-public class FwDeviceVO {
+public class FwDeviceVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -85,6 +91,12 @@
private Long belongDept;
/**
+ * 设备出入库状态 0未出库1已出库
+ */
+ @ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+ private Integer trackStatus;
+
+ /**
* 负责人
*/
@ApiModelProperty(value = "负责人")
@@ -103,13 +115,85 @@
@ApiModelProperty("运行状态（0:在线/1:离线/2:故障/3:报废）")
private Integer status;
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 电量百分比 0-100
+ */
+ @ApiModelProperty(value = "电量百分比 0-100")
+ private Byte batteryPct;
+ /**
+ * 方位角 0-360°
+ */
+ @ApiModelProperty(value = "方位角 0-360°")
+ private Short azimuth;
+ /**
+ * 俯仰角 -90-+90°
+ */
+ @ApiModelProperty(value = "俯仰角 -90-+90°")
+ private Short elevation;
+ /**
+ * 侦测目标数量
+ */
+ @ApiModelProperty(value = "侦测目标数量")
+ private Integer detectTargetCnt;
+ /**
+ * 有效范围 km
+ */
+ @ApiModelProperty(value = "有效范围 km")
+ private BigDecimal effectiveRangeKm;
+
+ /**
+ * 工作模式：侦测中/信号干扰中/诱导驱离中/待机
+ */
+ @ApiModelProperty(value = "工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机")
+ private String workMode;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+ /**
+ * 设备sn
+ */
+ @ApiModelProperty(value = "设备sn")
+ private String deviceSn;
+
+ @ApiModelProperty(value = "场景名称")
+ private String sceneName;
+
@ApiModelProperty(value = "所属部门名称")
public String getBelongDeptName() {
if (belongDept == null) {
return null;
}
- System.out.println("12312312312:" + SysCache.getDeptName(belongDept));
return SysCache.getDeptName(belongDept);
}
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
}
--
Gitblit v1.9.3