From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 200 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..bc0efcc 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,215 @@
*/
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;
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
- * 反无设备表 视图实体类
+ * 设备表 视图实体类
*
- * @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 = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ 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;
+
+ /**
+ * 设备出入库状态 0未出库1已出库
+ */
+ @ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+ private Integer trackStatus;
+
+ /**
+ * 负责人
+ */
+ @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);
+ }
+
+ /**
+ * 创建人
+ */
+ @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;
+
+ @ApiModelProperty(value = "最终出库区域")
+ private String finalOutboundArea;
+
+ /**
+ * 使用日期
+ */
+ @ApiModelProperty(value = "使用日期")
+ private Date useDate;
+
+ /**
+ * 使用年限（单位：年）
+ */
+ @ApiModelProperty(value = "使用年限（单位：年）")
+ private Integer serviceLife;
+
+ /**
+ * 维护状态：0-否，1-是（一个月内要到使用年限）
+ */
+ @ApiModelProperty(value = "维护状态：0-否，1-是（一个月内要到使用年限）")
+ private Integer maintenanceStatus;
}
--
Gitblit v1.9.3