From 6b4380956666f47a055493dd2c064148e5b7e94a Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 15:12:53 +0800
Subject: [PATCH] 1.增加注释，修改字段名称和代码格式。 2.合并无人机盒子和无人机管理代码。 3.地图管理和tile管理增加字段名称。 4.增加根据boxSn获取六合盒子列表接口。
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
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..a9dbaf2 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);
}
@@ -102,21 +101,8 @@
@Override
public List<BoxInfoReceiver> getBoxList() {
List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerManagementList(new ArdServerInfo());
-
- return ardServerInfos.stream()
- .flatMap(ardServerInfo -> {
- String baseUrl = "http://" + ardServerInfo.getHost() + ":" + ardServerInfo.getHttpPort();
- try {
- List<BoxInfoReceiver> boxes = tyClient.getBoxList(baseUrl).getContent();
- return Optional.ofNullable(boxes).orElse(Collections.emptyList()).stream();
- } catch (Exception e) {
- log.error("获取云盒列表失败: {}", baseUrl, e);
- return Stream.empty();
- }
- })
- .collect(Collectors.toList());
+ return getBoxList(ardServerInfos);
}
-
/**
* 获取直播地址
@@ -125,7 +111,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);
@@ -853,6 +838,33 @@
}
}
+ /**
+ * 根据boxSn获取六合盒子列表
+ * @return List<BoxInfoReceiver>
+ */
+ @Override
+ public List<BoxInfoReceiver> getBoxSnToList(String boxSn) {
+ ArdServerInfo serverInfo = new ArdServerInfo();
+ serverInfo.setHost(boxSn);
+ List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerManagementList(serverInfo);
+ return getBoxList(ardServerInfos);
+ }
+
+ private List<BoxInfoReceiver> getBoxList(List<ArdServerInfo> ls) {
+ return ls.stream()
+ .flatMap(ardServerInfo -> {
+ String baseUrl = "http://" + ardServerInfo.getHost() + ":" + ardServerInfo.getHttpPort();
+ try {
+ List<BoxInfoReceiver> boxes = tyClient.getBoxList(baseUrl).getContent();
+ return Optional.ofNullable(boxes).orElse(Collections.emptyList()).stream();
+ } catch (Exception e) {
+ log.error("获取云盒列表失败: {}", baseUrl, e);
+ return Stream.empty();
+ }
+ })
+ .collect(Collectors.toList());
+ }
+
//公共日志打印
private void logPrint(String message, Object obj) {
log.debug("收到{}回复{}", message, obj);
@@ -869,7 +881,7 @@
/**
- * 定时向所有已连接的天宇服务器发送心跳
+ * 定时向所有已连接的六合服务器发送心跳
*/
@Scheduled(fixedRate = 5000) // 每5秒执行一次
public void sendHeartBeat() {
--
Gitblit v1.9.3