From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java |  146 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 141 insertions(+), 5 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 14bf04b..af6def8 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,156 @@
  */
 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;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 反无设备表 视图实体类
+ * 设备表 视图实体类
  *
- * @author AIX
- * @since 2026-01-06
+ * @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("创建时间")
+	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;
+		}
+		return SysCache.getDeptName(belongDept);
+	}
+
 }

--
Gitblit v1.9.3