From 1de35281a699b8d2ca90777f63c7e032c3c9dc3d Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 12 十月 2026 13:34:34 +0800
Subject: [PATCH] 对接第 6 台新威上位机（7.6 客户端，走库路线），并修两处对接中暴露的问题
---
ruoyi-admin/src/main/java/com/battery/business/runtime/RedisDeviceDiscoveryCandidateStore.java | 48 +++++++++---------------------------------------
1 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/battery/business/runtime/RedisDeviceDiscoveryCandidateStore.java b/ruoyi-admin/src/main/java/com/battery/business/runtime/RedisDeviceDiscoveryCandidateStore.java
index ac32c87..f5f6dac 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/runtime/RedisDeviceDiscoveryCandidateStore.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/runtime/RedisDeviceDiscoveryCandidateStore.java
@@ -36,31 +36,17 @@
Map<String, CabinetCandidate> merged = new LinkedHashMap<>();
current.cabinets().forEach(item -> merged.put(item.deviceCode(), item));
candidates.forEach(item -> merged.put(item.deviceCode(), item));
- save(new StoredState(CURRENT_VERSION, List.copyOf(merged.values()), current.collectors()));
+ save(new StoredState(CURRENT_VERSION, List.copyOf(merged.values())));
}
- /** 替换指定设备适配器实例的全部采集器候选，其它实例的候选保持不变。 */
- @Override
- public synchronized void replaceCollectors(String adapterCode, List<CollectorCandidate> candidates)
- {
- StoredState current = load();
- List<CollectorCandidate> retained = current.collectors().stream()
- .filter(item -> !item.adapterCode().equals(adapterCode)).toList();
- java.util.ArrayList<CollectorCandidate> merged = new java.util.ArrayList<>(retained);
- merged.addAll(candidates);
- save(new StoredState(CURRENT_VERSION, current.cabinets(), merged));
- }
-
- /** 删除指定设备适配器实例的检测柜与采集器候选；仅供人工重置或实机联调清理。 */
+ /** 删除指定设备适配器实例的检测柜候选；仅供人工重置或实机联调清理。 */
@Override
public synchronized void removeAdapter(String adapterCode)
{
StoredState current = load();
List<CabinetCandidate> cabinets = current.cabinets().stream()
.filter(item -> !item.adapterCode().equals(adapterCode)).toList();
- List<CollectorCandidate> collectors = current.collectors().stream()
- .filter(item -> !item.adapterCode().equals(adapterCode)).toList();
- save(new StoredState(CURRENT_VERSION, cabinets, collectors));
+ save(new StoredState(CURRENT_VERSION, cabinets));
}
/**
@@ -74,17 +60,14 @@
StoredState current = load();
List<CabinetCandidate> cabinets = current.cabinets().stream()
.filter(item -> item.expiresAt().isAfter(now)).toList();
- List<CollectorCandidate> collectors = current.collectors().stream()
- .filter(item -> item.expiresAt().isAfter(now)).toList();
- if (cabinets.size() != current.cabinets().size() || collectors.size() != current.collectors().size())
- save(new StoredState(CURRENT_VERSION, cabinets, collectors));
- return new CandidateSnapshot(cabinets, collectors);
+ if (cabinets.size() != current.cabinets().size()) save(new StoredState(CURRENT_VERSION, cabinets));
+ return new CandidateSnapshot(cabinets);
}
private StoredState load()
{
Object stored = redisTemplate.opsForValue().get(STATE_KEY);
- if (stored == null) return new StoredState(CURRENT_VERSION, List.of(), List.of());
+ if (stored == null) return new StoredState(CURRENT_VERSION, List.of());
try
{
// 通用 RedisTemplate 可能把泛型数组恢复为 JSONObject；在存储边界逐字段重建，禁止业务层强转。
@@ -93,10 +76,9 @@
if (version == null || version != CURRENT_VERSION)
throw new IllegalStateException("Unsupported device discovery state version: " + version);
List<CabinetCandidate> cabinets = new ArrayList<>();
+ // collectors 是模拟器时代写进同一 key 的历史字段：读到就忽略，不再恢复也不回写。
requiredArray(root, "cabinets").forEach(item -> cabinets.add(cabinetCandidate(item)));
- List<CollectorCandidate> collectors = new ArrayList<>();
- requiredArray(root, "collectors").forEach(item -> collectors.add(collectorCandidate(item)));
- return new StoredState(CURRENT_VERSION, cabinets, collectors);
+ return new StoredState(CURRENT_VERSION, cabinets);
}
catch (IllegalStateException exception)
{
@@ -155,16 +137,6 @@
latestSnapshot, optionalInstant(object, "lastDataAt"), object.getString("sourceDisplayNo"));
}
- private CollectorCandidate collectorCandidate(Object value)
- {
- JSONObject object = jsonObject(value);
- return new CollectorCandidate(object.getString("adapterCode"), object.getString("deviceCode"),
- object.getString("ip"), object.getString("mac"), object.getString("name"),
- object.getString("manufacturer"), object.getString("model"), object.getIntValue("channelCount"),
- object.getBooleanValue("online"), requiredInstant(object, "observedAt"),
- requiredInstant(object, "expiresAt"));
- }
-
private Instant requiredInstant(JSONObject object, String field)
{
Instant value = object.getObject(field, Instant.class);
@@ -183,13 +155,11 @@
redisTemplate.opsForValue().set(STATE_KEY, JSON.toJSONString(state));
}
- private record StoredState(int version, List<CabinetCandidate> cabinets,
- List<CollectorCandidate> collectors)
+ private record StoredState(int version, List<CabinetCandidate> cabinets)
{
private StoredState
{
cabinets = List.copyOf(cabinets);
- collectors = List.copyOf(collectors);
}
}
}
--
Gitblit v1.7.1