From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java | 24 ------------------------
1 files changed, 0 insertions(+), 24 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 ad2e534..025eee6 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,14 +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;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.DigestUtils;
@@ -40,9 +37,6 @@
@Resource
private TyTcpClientManager tyTcpClientManager;
- @Resource
- private ArdDroneInfoMapper ArdDroneInfoMapper;
-
/**
* 查询服务器管理
*
@@ -63,24 +57,6 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdServerInfo> selectArdServerInfoList(ArdServerInfo ardServerInfo) {
- 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