From e90d0fe42b652c9230c5e544d177dbedb3e57580 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 19 Nov 2025 13:51:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
index 4e7afcd..902445d 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdServerInfo.java
@@ -3,14 +3,17 @@
import java.util.List;
import com.ard.common.core.domain.BaseEntity;
+import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
- * 服务器管理对象 ard_server_info
+ * 服务器管理对象 ard_server
*
* @author xia
* @date 2025-10-10
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdServerInfo extends BaseEntity {
@@ -26,10 +29,10 @@
private String host;
/** tcp端口 */
- private String tcpPort;
+ private Integer tcpPort;
- /** 环境地址端口 */
- private String httpPort;
+ /** http端口 */
+ private Integer httpPort;
/** 访问密钥ID */
private String accessKeyId;
@@ -52,6 +55,13 @@
/** 部门ID */
private Long deptId;
+ /**
+ * 服务器状态
+ * 0：离线
+ * 1：在线
+ */
+ private String serverStatus;
+
private List<ArdDroneInfo> ardDroneInfoList;
}
--
Gitblit v1.9.3