From 147428971be43eed90a79f3849f15000d3855390 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 28 九月 2026 15:15:22 +0800
Subject: [PATCH] 实现新威 7.6 直连取数与逐行接收
---
battery-business/src/main/java/com/battery/business/service/impl/TTestLiveServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/battery-business/src/main/java/com/battery/business/service/impl/TTestLiveServiceImpl.java b/battery-business/src/main/java/com/battery/business/service/impl/TTestLiveServiceImpl.java
index 0ee9d4d..f9a7270 100644
--- a/battery-business/src/main/java/com/battery/business/service/impl/TTestLiveServiceImpl.java
+++ b/battery-business/src/main/java/com/battery/business/service/impl/TTestLiveServiceImpl.java
@@ -191,6 +191,10 @@
private Map<String, Object> snapshot(ChannelCandidate channel)
{
Map<String, Object> value = new LinkedHashMap<>();
+ // 通道工作状态是独立设备事实：读库来源下不可观测，界面把它当正常取值展示而不是异常。
+ value.put("workStatus", channel.workStatus() == null ? null : channel.workStatus().name());
+ // 最近数据时间取来源里最近一次采样行的设备时间，与展示轮询节奏无关。
+ value.put("lastDataAt", channel.lastDataAt() == null ? null : channel.lastDataAt().toEpochMilli());
if (channel.latestSnapshot() == null) return value;
value.put("source", "检测柜");
value.put("observedAt", channel.latestSnapshot().receivedAt().toEpochMilli());
@@ -232,7 +236,8 @@
return new LiveSource("COLLECTOR", battery.getCollectorId(), battery.getBatteryNo(),
online ? "ONLINE" : "OFFLINE", Map.of());
}
- var collector = adapter.latestCollector(collectorCode);
+ var collector = adapter.latestCollector(
+ battery.getBinding() == null ? null : battery.getBinding().getAdapterCode(), collectorCode);
if (collector != null)
{
Map<String, Object> value = new LinkedHashMap<>();
--
Gitblit v1.7.1