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/detection/dto/FwDeviceConfigDTO.java | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java
index c62e89b..9c049b3 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwDeviceConfigDTO.java
@@ -16,9 +16,13 @@
*/
package org.sxkj.fw.detection.dto;
-import org.sxkj.fw.detection.entity.FwDeviceConfigEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 设备配置表 数据传输对象实体类
@@ -27,8 +31,70 @@
* @since 2026-01-08
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceConfigDTO extends FwDeviceConfigEntity {
+public class FwDeviceConfigDTO implements Serializable {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 设备ID（tz_device_deploy.id）
+ */
+ @ApiModelProperty(value = "设备ID（tz_device_deploy.id）")
+ private Long deviceId;
+ /**
+ * 配置版本号
+ */
+ @ApiModelProperty(value = "配置版本号")
+ private Integer configVersion;
+ /**
+ * 是否最新 1最新 0历史
+ */
+ @ApiModelProperty(value = "是否最新 1最新 0历史")
+ private Byte isLatest;
+ /**
+ * 全部参数（JSON）
+ */
+ @ApiModelProperty(value = "全部参数（JSON）")
+ private String configJson;
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+ /**
+ * 创建人
+ */
+ @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