From 19763ebd20ad16435f3c1ccfdc8abd1518712cc1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 24 Dec 2025 15:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
index d4063de..ad2e534 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java
@@ -5,9 +5,11 @@
import com.ard.work.component.forest.TyClient;
import com.ard.work.component.netty.TyTcpClientManager;
import com.ard.work.domain.dto.TokenDTO;
+import com.ard.work.domain.entity.ArdDroneInfo;
import com.ard.work.domain.entity.ArdServerInfo;
import com.ard.work.domain.receiver.AccessTokenReceiver;
import com.ard.work.domain.receiver.TyHttpCommonReceiver;
+import com.ard.work.mapper.ArdDroneInfoMapper;
import com.ard.work.mapper.ArdServerInfoMapper;
import com.ard.work.service.IArdServerInfoService;
import com.dtflys.forest.exceptions.ForestRuntimeException;
@@ -30,11 +32,16 @@
public class ArdServerInfoServiceImpl implements IArdServerInfoService {
@Resource
- private ArdServerInfoMapper ardServerInfoMapper;
- @Resource
private TyClient tyClient;
+
+ @Resource
+ private ArdServerInfoMapper ardServerInfoMapper;
+
@Resource
private TyTcpClientManager tyTcpClientManager;
+
+ @Resource
+ private ArdDroneInfoMapper ArdDroneInfoMapper;
/**
* 查询服务器管理
@@ -59,6 +66,24 @@
return ardServerInfoMapper.selectArdServerInfoList(ardServerInfo);
}
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u")
+ public List<ArdServerInfo> selectArdServerInfoListNo(ArdServerInfo ardServerInfo) {
+
+// List<ArdDroneInfo> ardDroneInfos = ArdDroneInfoMapper.selectArdDroneList(new ArdDroneInfo());
+// for (ArdDroneInfo ardDroneInfo : ardDroneInfos) {
+// ardDroneInfo.getBoxSn();
+// }
+// List<ArdServerInfo> servers = ardServerInfoMapper.selectArdServerInfoList(ardServerInfo);
+// for (ArdServerInfo server : servers) {
+// for (ArdDroneInfo ardDroneInfo : server.getArdDroneInfoList()) {
+// ardDroneInfo.getBoxSn();
+// }
+// }
+
+ return ardServerInfoMapper.selectArdServerInfoList(ardServerInfo);
+ }
+
/**
* 新增服务器管理
*
--
Gitblit v1.9.3