From 317c4c6a45508ab64461c36aad2c93d4a0d3a15a Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 23:52:35 +0800
Subject: [PATCH] 修复采集器状态同步与软删除绑定过滤
---
ruoyi-admin/src/main/java/com/ruoyi/config/DevelopmentCollectorStatusSynchronizer.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/config/DevelopmentCollectorStatusSynchronizer.java b/ruoyi-admin/src/main/java/com/ruoyi/config/DevelopmentCollectorStatusSynchronizer.java
index d6c33cd..431da82 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/config/DevelopmentCollectorStatusSynchronizer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/config/DevelopmentCollectorStatusSynchronizer.java
@@ -11,7 +11,7 @@
import com.ruoyi.device.discovery.DeviceDiscoveryCandidateStore.CollectorCandidate;
import com.ruoyi.system.mapper.TCollectorMapper;
-/** 将模拟采集器的发现和实时状态写入 Redis，不回写正式 MySQL 记录。 */
+/** 将模拟采集器的发现写入 Redis，并同步已登记采集器的实时在线事实。 */
@Component
public class DevelopmentCollectorStatusSynchronizer
{
@@ -20,12 +20,6 @@
private final TCollectorMapper collectorMapper;
@Autowired
- public DevelopmentCollectorStatusSynchronizer(BtsDevelopmentSimulator simulator,
- DeviceDiscoveryCandidateStore candidateStore)
- {
- this(simulator, candidateStore, null);
- }
-
public DevelopmentCollectorStatusSynchronizer(BtsDevelopmentSimulator simulator,
DeviceDiscoveryCandidateStore candidateStore, TCollectorMapper collectorMapper)
{
@@ -46,10 +40,7 @@
observedAt.plus(Duration.ofSeconds(30))))
.toList();
candidateStore.replaceCollectors(BtsDevelopmentSimulator.ADAPTER_CODE, candidates);
- if (collectorMapper != null)
- {
- candidates.forEach(candidate -> collectorMapper.updateRegisteredObservation(candidate.deviceCode(),
- candidate.online() ? "ONLINE" : "OFFLINE"));
- }
+ candidates.forEach(candidate -> collectorMapper.updateRegisteredObservation(candidate.deviceCode(),
+ candidate.online() ? "ONLINE" : "OFFLINE"));
}
}
--
Gitblit v1.7.1