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 | 63 ++++++++++++++++++++++++++++++- 1 files changed, 61 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 af6def8..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,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; /** @@ -87,6 +89,12 @@ */ @ApiModelProperty(value = "所属部门id") private Long belongDept; + + /** + * 设备出入库状态 0未出库1已出库 + */ + @ApiModelProperty(value = "设备出入库状态 0未出库1已出库") + private Integer trackStatus; /** * 负责人 @@ -168,4 +176,55 @@ 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