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/test/java/com/ruoyi/system/service/impl/CollectorDiscoveryServiceImplTest.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/CollectorDiscoveryServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/CollectorDiscoveryServiceImplTest.java
index 4133bba..685e1cc 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/CollectorDiscoveryServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/CollectorDiscoveryServiceImplTest.java
@@ -11,6 +11,7 @@
import com.ruoyi.device.bts.BtsDevelopmentSimulator;
import com.ruoyi.device.discovery.InMemoryDeviceDiscoveryCandidateStore;
import com.ruoyi.system.domain.vo.DiscoveredCollectorVo;
+import com.ruoyi.system.mapper.TCollectorMapper;
import com.ruoyi.system.service.ITCollectorService;
/**
@@ -28,9 +29,10 @@
InMemoryDeviceDiscoveryCandidateStore store = new InMemoryDeviceDiscoveryCandidateStore();
DevelopmentCollectorDiscoveryService service =
new DevelopmentCollectorDiscoveryService(store, collectorService);
+ TCollectorMapper collectorMapper = mock(TCollectorMapper.class);
simulator.addDevice("127.0.0.8", 2);
simulator.addCollector("127.0.1.3", 6);
- new DevelopmentCollectorStatusSynchronizer(simulator, store).synchronizeOnlineStatus();
+ new DevelopmentCollectorStatusSynchronizer(simulator, store, collectorMapper).synchronizeOnlineStatus();
List<DiscoveredCollectorVo> result = service.selectDiscoveredCollectorList();
@@ -57,8 +59,9 @@
InMemoryDeviceDiscoveryCandidateStore store = new InMemoryDeviceDiscoveryCandidateStore();
DevelopmentCollectorDiscoveryService service =
new DevelopmentCollectorDiscoveryService(store, collectorService);
+ TCollectorMapper collectorMapper = mock(TCollectorMapper.class);
simulator.updateCollector(1, "127.0.1.9", 8, false);
- new DevelopmentCollectorStatusSynchronizer(simulator, store).synchronizeOnlineStatus();
+ new DevelopmentCollectorStatusSynchronizer(simulator, store, collectorMapper).synchronizeOnlineStatus();
List<DiscoveredCollectorVo> result = service.selectDiscoveredCollectorList();
@@ -75,7 +78,8 @@
InMemoryDeviceDiscoveryCandidateStore store = new InMemoryDeviceDiscoveryCandidateStore();
DevelopmentCollectorDiscoveryService service =
new DevelopmentCollectorDiscoveryService(store, collectorService);
- new DevelopmentCollectorStatusSynchronizer(simulator, store).synchronizeOnlineStatus();
+ TCollectorMapper collectorMapper = mock(TCollectorMapper.class);
+ new DevelopmentCollectorStatusSynchronizer(simulator, store, collectorMapper).synchronizeOnlineStatus();
when(collectorService.selectRegisteredCollectorCodes())
.thenReturn(Set.of("dev-sim-collector-1"))
.thenReturn(Set.of());
--
Gitblit v1.7.1