From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java
index ffb3a8b..b3093fe 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java
@@ -16,35 +16,51 @@
*/
package org.sxkj.fw.device.dto;
-import io.swagger.annotations.ApiModelProperty;
-import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 设备跟踪流转表 数据传输对象实体类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Data
-public class FwDeviceTrackDTO {
+public class FwDeviceTrackDTO implements Serializable {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 设备ID
+ */
+ @ApiModelProperty(value = "设备ID", required = true)
+ @NotNull
+ private Long deviceId;
/**
* 出库时间
*/
@ApiModelProperty(value = "出库时间")
private Date outTime;
-
/**
* 出库去向
*/
@ApiModelProperty(value = "出库去向")
private String outTarget;
+
+ /**
+ * 出库去向
+ */
+ @ApiModelProperty(value = "出库去向编码")
+ private String outTargetCode;
/**
* 用途
*/
@@ -60,10 +76,45 @@
*/
@ApiModelProperty(value = "联系电话")
private String contactPhone;
- /**
- * 部门名称
- */
- @ApiModelProperty(value = "部门名称")
- private String deptName;
+
+
+
+
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
+ /**
+ * 删除标志（0存在 1删除）
+ */
+ @ApiModelProperty(value = "删除标志（0存在 1删除）")
+ private Integer isDeleted;
}
--
Gitblit v1.9.3