From 6c38637d89f346a660618558451f2dd7286dc7a5 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 31 八月 2026 22:51:54 +0800
Subject: [PATCH] 补齐检测柜模拟器完整 Excel 数据生命周期
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceDiscoveryPersistenceService.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceDiscoveryPersistenceService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceDiscoveryPersistenceService.java
index 3ddb1db..ff4ad99 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceDiscoveryPersistenceService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceDiscoveryPersistenceService.java
@@ -53,19 +53,16 @@
return discoverNow(registry, source);
}
- /** 调度器观测；暂停或停止测试且没有其他接收测试时，不再向该适配器请求实时数据。 */
+ /** 执行设备发现；是否请求实时快照由接收中的通道集合单独决定。 */
public AdapterDiscoveryResult discoverForReception(DeviceAdapterRegistry registry, DiscoverySource source)
{
- if (!shouldPollReception(source.adapterCode()))
- return new AdapterDiscoveryResult(0, 0, Instant.now());
return discoverNow(registry, source);
}
- /** 判断适配器是否仍需为活动测试发起实时请求。 */
+ /** 判断适配器是否存在需要实时请求的接收中测试。 */
public boolean shouldPollReception(String adapterCode)
{
- return testMapper == null || testMapper.hasReceivingTestForAdapter(adapterCode) > 0
- || testMapper.hasPausedOrEndedTestForAdapter(adapterCode) == 0;
+ return testMapper == null || testMapper.hasReceivingTestForAdapter(adapterCode) > 0;
}
private AdapterDiscoveryResult discoverNow(DeviceAdapterRegistry registry, DiscoverySource source)
--
Gitblit v1.7.1