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-gd/src/main/java/org/sxkj/gd/workorder/dto/GdManageDeviceDTO.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdManageDeviceDTO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdManageDeviceDTO.java
index 65d7617..76f4f9c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdManageDeviceDTO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdManageDeviceDTO.java
@@ -16,9 +16,18 @@
*/
package org.sxkj.gd.workorder.dto;
-import org.sxkj.gd.workorder.entity.GdManageDeviceEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+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;
/**
* 设备信息 数据传输对象实体类
@@ -27,8 +36,96 @@
* @since 2026-01-14
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdManageDeviceDTO extends GdManageDeviceEntity {
+public class GdManageDeviceDTO implements Serializable {
+
private static final long serialVersionUID = 1L;
+ @ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+ /**
+ * 设备编码
+ */
+ @ApiModelProperty(value = "设备编码")
+ private String deviceSn;
+ /**
+ * 设备型号
+ */
+ @ApiModelProperty(value = "设备型号")
+ private String deviceName;
+ /**
+ * 设备昵称
+ */
+ @ApiModelProperty(value = "设备昵称")
+ private String nickname;
+ /**
+ * 设备类型（0机场，1无人机）
+ */
+ @ApiModelProperty(value = "设备类型（0机场,1无人机）")
+ private Integer deviceType;
+ /**
+ * 设备负载（红外，喇叭，闪光灯）
+ */
+ @ApiModelProperty(value = "设备负载（红外,喇叭,闪光灯）")
+ private String devicePayload;
+ /**
+ /**
+ * 当前经度
+ */
+ @ApiModelProperty(value = "当前经度")
+ private Double longitude;
+ /**
+ * 当前纬度
+ */
+ @ApiModelProperty(value = "当前纬度")
+ private Double latitude;
+ /**
+ * 固件版本
+ */
+ @ApiModelProperty(value = "固件版本")
+ private String firmwareVersion;
+ /**
+ * 子设备（一般用途是机场下面的无人机）
+ */
+ @ApiModelProperty(value = "子设备（一般用途是机场下面的无人机）")
+ private String childSn;
+ /**
+ * 设备状态：{0:"在线",1:"离线"}
+ */
+ @ApiModelProperty(value = "设备状态：{0:\"在线\",1:\"离线\"}")
+ private Long modeCode;
+ /**
+ * 保险过期时间
+ */
+ @ApiModelProperty(value = "保险过期时间yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date insureExpiredTime;
+ /**
+ * 剩余流量(单位:GB)
+ */
+ @ApiModelProperty(value = "剩余流量(单位:GB)")
+ private BigDecimal trafficRemaining;
+ /**
+ * 流量到期时间
+ */
+ @ApiModelProperty(value = "流量到期时间yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date trafficExpireTime;
+
+ /**
+ * 设备维护状态{0:无需保养,1:待保养,2:正在保养}
+ */
+ @ApiModelProperty(value = "设备维护状态{0:无需保养,1:待保养,2:正在保养}")
+ private Integer maintenanceState;
+
}
--
Gitblit v1.9.3