From e90fcceee583f9428b40a551c31ae29a3492f2bf Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 11:23:37 +0800
Subject: [PATCH] 1.修改名称(天宇 ——》六合)。
---
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java | 6 ++++++
ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java | 8 ++++++++
ard-work/src/main/java/com/ard/work/domain/entity/ArdDroneInfo.java | 1 -
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 4 +---
ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java | 10 +++++-----
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
index c087b4a..fccf3db 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/TyTcpClientManager.java
@@ -62,7 +62,7 @@
}
/**
- * 初始化与天宇服务器的连接
+ * 初始化与六合服务器的连接
*/
public void initConnection(String serverId, String host, Integer port) {
String key = host + ":" + port;
@@ -113,23 +113,23 @@
try {
TcpClientSession session = channels.get(serverId);
if (session == null) {
- log.error("未找到天宇服务器 [{}] 的连接", serverId);
+ log.error("未找到六合服务器 [{}] 的连接", serverId);
return;
}
ChannelFuture future = session.getChannelFuture();
if (future == null || !future.channel().isActive()) {
- log.warn("天宇服务器 [{}] 连接未激活，无法发送消息", serverId);
+ log.warn("六合服务器 [{}] 连接未激活，无法发送消息", serverId);
return;
}
InetSocketAddress remote = (InetSocketAddress) future.channel().remoteAddress();
future.channel().writeAndFlush(msg);
- log.debug("→ 向天宇服务器 [{}] ({}:{}) 发送消息，命令码：0x{}",
+ log.debug("→ 向六合服务器 [{}] ({}:{}) 发送消息，命令码：0x{}",
serverId, remote.getHostString(), remote.getPort(),
String.format("%02X", msg.getCmdCode() & 0xFF));
} catch (Exception e) {
- log.error("发送消息到天宇服务器 [{}] 异常：{}", serverId, e.getMessage());
+ log.error("发送消息到六合服务器 [{}] 异常：{}", serverId, e.getMessage());
}
}
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 999ab85..8efdfde 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
@@ -15,7 +15,6 @@
* @author ruoyi
* @date 2025-03-04
*/
-
@Data
@Builder
@AllArgsConstructor
diff --git a/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java b/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
index 30292fd..a8b760f 100644
--- a/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
+++ b/ard-work/src/main/java/com/ard/work/mapper/ArdDroneInfoMapper.java
@@ -11,6 +11,7 @@
* @date 2025-03-04
*/
public interface ArdDroneInfoMapper {
+
/**
* 查询无人机盒子
*
@@ -18,6 +19,13 @@
* @return 无人机盒子
*/
ArdDroneInfo selectArdDroneById(String id);
+
+ /**
+ * 查询无人机盒子
+ *
+ * @param boxSn 盒子编码
+ * @return 无人机盒子
+ */
ArdDroneInfo selectArdDroneByBoxSn(String boxSn);
/**
* 查询无人机盒子列表
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java
index 63eaa19..53bb06e 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdDroneServiceImpl.java
@@ -42,6 +42,12 @@
return ArdDroneInfoMapper.selectArdDroneById(id);
}
+ /**
+ * 查询无人机盒子
+ *
+ * @param boxSn 盒子编码
+ * @return 无人机盒子
+ */
@Override
public ArdDroneInfo selectArdDroneByboxSn(String boxSn) {
return ArdDroneInfoMapper.selectArdDroneByBoxSn(boxSn);
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index 4e5904d..f746584 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -90,7 +90,6 @@
*/
@Override
public AccessTokenReceiver getAccessToken(String serverId) {
-
return ardServerService.getAccessToken(serverId);
}
@@ -125,7 +124,6 @@
*/
@Override
public BoxStreamUrlReceiver getBoxLiveUrl(String boxSn) {
-
ArdDroneInfo ardDroneInfo = ardDroneService.selectArdDroneByboxSn(boxSn);
String baseUrl="http://"+ardDroneInfo.getArdServerInfo().getHost()+":"+ardDroneInfo.getArdServerInfo().getHttpPort();
TyHttpCommonReceiver<BoxStreamUrlReceiver> boxLiveUrl = tyClient.getBoxLiveUrl(baseUrl,boxSn);
@@ -869,7 +867,7 @@
/**
- * 定时向所有已连接的天宇服务器发送心跳
+ * 定时向所有已连接的六合服务器发送心跳
*/
@Scheduled(fixedRate = 5000) // 每5秒执行一次
public void sendHeartBeat() {
--
Gitblit v1.9.3