From 1522564d7ddf949131641f220766a25d8d981751 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期日, 30 八月 2026 16:07:20 +0800
Subject: [PATCH] 收敛测试暂停继续与停止生命周期
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
index dd57211..1b35d1a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceAdapterServiceImpl.java
@@ -135,7 +135,7 @@
try
{
registry.synchronize(toRuntimeConfig(adapter));
- AdapterDiscoveryResult result = persistence.discover(registry, new DiscoverySource(
+ AdapterDiscoveryResult result = persistence.discoverForReception(registry, new DiscoverySource(
adapter.getAdapterCode(), adapter.getAdapterId(), adapter.getAdapterName(),
adapter.getPollIntervalMs()));
mapper.updateDiscoverySuccess(adapterId, result.observedAtUtc());
@@ -191,7 +191,10 @@
{
Instant lastAttempt = adapter.getLastAttemptAtUtc();
if (lastAttempt != null && Duration.between(lastAttempt, now).toMillis() < adapter.getPollIntervalMs()) continue;
- try { discover(adapter.getAdapterId()); }
+ try
+ {
+ if (persistence.shouldPollReception(adapter.getAdapterCode())) discover(adapter.getAdapterId());
+ }
catch (ServiceException ignored) { /* 失败状态已持久化，下一轮按周期重试。 */ }
}
}
--
Gitblit v1.7.1