From 68156d14934ffb7d7b6e0dca63d3dcf3ed43c995 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 18:01:40 +0800
Subject: [PATCH] 修复离线设备无法发现和登记的问题
---
ruoyi-admin/src/main/java/com/battery/business/runtime/DevelopmentCollectorDiscoveryService.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/battery/business/runtime/DevelopmentCollectorDiscoveryService.java b/ruoyi-admin/src/main/java/com/battery/business/runtime/DevelopmentCollectorDiscoveryService.java
index e73a87d..6741cf1 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/runtime/DevelopmentCollectorDiscoveryService.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/runtime/DevelopmentCollectorDiscoveryService.java
@@ -23,17 +23,16 @@
this.collectorService = collectorService;
}
- /** 返回在线且未登记的独立采集器快照，不混入 BTS 检测柜设备。 */
+ /** 返回未过期且未登记的采集器，离线事实不影响发现展示或登记资格。 */
@Override
public List<DiscoveredCollectorVo> selectDiscoveredCollectorList()
{
Set<String> registeredCodes = collectorService.selectRegisteredCollectorCodes();
return candidateStore.snapshot(Instant.now()).collectors().stream()
- .filter(collector -> collector.online()
- && !registeredCodes.contains(collector.deviceCode()))
+ .filter(collector -> !registeredCodes.contains(collector.deviceCode()))
.map(collector -> new DiscoveredCollectorVo(collector.deviceCode(), collector.ip(), collector.mac(),
collector.name(), collector.manufacturer(), collector.model(), collector.channelCount(),
- "在线", "空闲", "-"))
+ collector.online() ? "在线" : "离线", "空闲", "-"))
.toList();
}
}
--
Gitblit v1.7.1