From 57d1dc78f42bfa13406748ff72fe2ddfcc997ab8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 14 Oct 2025 18:30:46 +0800
Subject: [PATCH] 2025-10-14 修改增加注解对应json字段
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 a9dbaf2..e54d009 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
@@ -59,6 +59,7 @@
import javax.annotation.Resource;
import java.net.InetSocketAddress;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@ -843,11 +844,17 @@
* @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);
+ public List<BoxInfoReceiver> getBoxSnToList(String id) {
+ ArdServerInfo ardServerInfos = ardServerService.selectArdServerManagementById(id);
+ String baseUrl = "http://" + ardServerInfos.getHost() + ":" + ardServerInfos.getHttpPort();
+ List<BoxInfoReceiver> lisbox = new ArrayList<>();
+ try {
+ lisbox = tyClient.getBoxList(baseUrl).getContent();
+ return lisbox;
+ } catch (Exception e) {
+ log.error("获取云盒列表失败: {}", baseUrl, e);
+ return lisbox;
+ }
}
private List<BoxInfoReceiver> getBoxList(List<ArdServerInfo> ls) {
--
Gitblit v1.9.3