From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 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 6ba55b1..69c749e 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,10 +24,10 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.sxkj.system.cache.SysCache;
-
import java.io.Serializable;
import java.math.BigDecimal;
-import java.util.Date;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 设备表 视图实体类
@@ -40,6 +41,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -89,6 +91,12 @@
private Long belongDept;
/**
+ * 设备出入库状态 0未出库1已出库
+ */
+ @ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+ private Integer trackStatus;
+
+ /**
* 负责人
*/
@ApiModelProperty(value = "负责人")
@@ -136,6 +144,30 @@
@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) {
@@ -144,4 +176,34 @@
return SysCache.getDeptName(belongDept);
}
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "出库去向")
+ private String outTarget;
+
+ @ApiModelProperty(value = "是否被共享给当前机构")
+ private Boolean isShared;
+
+ @ApiModelProperty(value = "共享记录ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long shareId;
}
--
Gitblit v1.9.3