From 0162f3730ca2e9644322a90450728b63243d40d0 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 13:36:20 +0800
Subject: [PATCH] 修正采集器历史与实时快照模型
---
ruoyi-device/src/main/java/com/ruoyi/device/simulator/BtsSimulatorStateStore.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/simulator/BtsSimulatorStateStore.java b/ruoyi-device/src/main/java/com/ruoyi/device/simulator/BtsSimulatorStateStore.java
index 1902705..7f70ae5 100644
--- a/ruoyi-device/src/main/java/com/ruoyi/device/simulator/BtsSimulatorStateStore.java
+++ b/ruoyi-device/src/main/java/com/ruoyi/device/simulator/BtsSimulatorStateStore.java
@@ -46,11 +46,13 @@
record CollectorState(int collectorId, String deviceCode, String ip, String mac, String name,
String manufacturer, String model, int channelCount, boolean online, int sampleIntervalMs,
long nextSequence, Instant lastSampledAt, List<CollectorChannelState> channels,
+ List<CollectorRealtimeMeasurement> latestMeasurements,
List<CollectorMeasurementRecord> history, CollectorHistoryFaults historyFaults)
{
public CollectorState
{
channels = List.copyOf(channels);
+ latestMeasurements = List.copyOf(latestMeasurements);
history = List.copyOf(history);
historyFaults = historyFaults == null ? CollectorHistoryFaults.none() : historyFaults;
}
@@ -61,7 +63,7 @@
{
this(collectorId, deviceCode, ip, mac, name, manufacturer, model, channelCount, online,
DevelopmentCollectorSimulation.DEFAULT_SAMPLE_INTERVAL_MS, 1L, null,
- DevelopmentCollectorSimulation.defaultChannels(channelCount), List.of(),
+ DevelopmentCollectorSimulation.defaultChannels(channelCount), List.of(), List.of(),
CollectorHistoryFaults.none());
}
}
@@ -73,6 +75,10 @@
record CollectorMetricState(String metricCode, BigDecimal value, String unit) { }
+ record CollectorRealtimeMeasurement(String adapterCode, String collectorCode, String channelCode,
+ long sequenceId, Instant deviceTime, String deviceTimeRaw, Instant serverReceivedAt,
+ String metricCode, BigDecimal value, String unit) { }
+
record CollectorMeasurementRecord(String adapterCode, String collectorCode, String channelCode,
long sequenceId, Instant deviceTime, String deviceTimeRaw, Instant serverReceivedAt,
String metricCode, BigDecimal value, String unit) { }
--
Gitblit v1.7.1