From bd2b0ca49bd1ee12c3ec67cb7e4c227cabe6b7df Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 11 Oct 2025 15:50:31 +0800
Subject: [PATCH] 1.修改主键类型。导致报错。
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 20 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
index 9c475f0..9aa97bf 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java
@@ -1,43 +1,90 @@
package com.ard.work.domain.entity;
-import java.util.Date;
-
+import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
-import lombok.Data;
+import com.ard.work.domain.receiver.BoxInfoReceiver;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.*;
+
+import java.util.Date;
+import java.util.Objects;
/**
- * 无人机管理对象 ard_drone_info
+ * 无人机盒子对象 uav_box
*
- * @author xia
- * @date 2025-10-10
+ * @author ruoyi
+ * @date 2025-03-04
*/
+
@Data
-public class ArdDroneInfo extends BaseEntity {
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArdDroneInfo extends BaseEntity{
private static final long serialVersionUID = 1L;
- /** ID */
+ /** 主键 */
private String id;
- /** 设备型号 */
- private String deviceModel;
+ /** 盒子编码 */
+ @Excel(name = "盒子编码")
+ private String boxSn;
- /** 设备SN */
- private String deviceSn;
+ /** 盒子名称 */
+ @Excel(name = "盒子名称")
+ private String boxName;
- /** 设备名称 */
- private String deviceName;
+ /** 盒子版本 */
+ @Excel(name = "盒子版本")
+ private String boxVersion;
- /** 工作状态 */
- private String deviceStatus;
+ /** 启动时间 */
+ @Excel(name = "启动时间")
+ private Date startTime;
- /** 加入时间 */
- private Date deviceAddTime;
+ /** 在线状态 */
+ @Excel(name = "在线状态")
+ private Integer onLine;
- /** 在线时间 */
- private Date onlineTime;
+ /** 视频服务器地址 */
+ @Excel(name = "视频服务器地址")
+ private String videoServer;
+
+ /** 视频服务器端口 */
+ @Excel(name = "视频服务器端口")
+ private Integer videoPort;
+
+ /** 最后任务id */
+ @Excel(name = "最后任务id")
+ private Integer lastTaskId;
+
+ /** 用户ID */
+ @Excel(name = "用户ID")
+ private Long userId;
+
+ /** 部门ID */
+ @Excel(name = "部门ID")
+ private Long deptId;
/** 服务器管理ID */
+ @Excel(name = "服务器管理ID")
private String serverInfoId;
+ /**
+ * 服务器实体对象
+ */
+ private ArdServerInfo ardServerInfo;
+
+ /**
+ * 判断两个无人机对象的属性是否相同
+ */
+ public boolean isSameAs(BoxInfoReceiver other) {
+ return Objects.equals(this.boxName, other.getBoxName()) &&
+ Objects.equals(this.boxVersion, other.getBoxVersion()) &&
+ Objects.equals(this.lastTaskId, other.getLastTaskId()) &&
+ Objects.equals(this.onLine, other.getOnLine());
+ // 对比其他属性
+ }
+
}
--
Gitblit v1.9.3