From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 3 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 e693639..fb242b3 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,20 +16,101 @@
*/
package org.sxkj.fw.device.vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.sxkj.system.cache.SysCache;
+
+import java.io.Serializable;
/**
* 设备表 视图实体类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceVO extends FwDeviceEntity {
+@Getter
+public class FwDeviceVO implements Serializable {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "主键")
+ private Long id;
+
+ /**
+ * 设备名称
+ */
+ @ApiModelProperty(value = "设备名称")
+ private String deviceName;
+ /**
+ * 设备类型（察打一体/便捷侦测箱/反制枪）
+ */
+ @ApiModelProperty(value = "设备类型（察打一体/便捷侦测箱/反制枪）")
+ private String deviceType;
+ /**
+ * 设备属性（无线电/光电/雷达）
+ */
+ @ApiModelProperty(value = "设备属性（无线电/光电/雷达）")
+ private String deviceAtt;
+ /**
+ * 型号
+ */
+ @ApiModelProperty(value = "型号")
+ private String deviceModel;
+ /**
+ * 规格
+ */
+ @ApiModelProperty(value = "规格")
+ private String deviceSpecification;
+ /**
+ * 生产厂商
+ */
+ @ApiModelProperty(value = "生产厂商")
+ private String manufacturer;
+ /**
+ * 来源
+ */
+ @ApiModelProperty(value = "来源")
+ private String source;
+ /**
+ * 用途
+ */
+ @ApiModelProperty(value = "用途")
+ private String purpose;
+ /**
+ * 所属部门
+ */
+ @ApiModelProperty(value = "所属部门id")
+ private Long belongDept;
+
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String charger;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String contactPhone;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty("运行状态（0:在线/1:离线/2:故障/3:报废）")
+ private Integer status;
+
+ @ApiModelProperty(value = "所属部门名称")
+ public String getBelongDeptName() {
+ if (belongDept == null) {
+ return null;
+ }
+ return SysCache.getDeptName(belongDept);
+ }
+
}
--
Gitblit v1.9.3