From a04222c873e5e55f48c8d33b5c0bc46fa524ac8d Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期四, 08 十月 2026 13:20:39 +0800
Subject: [PATCH] 界面显示号改为来源自报，并给出无歧义的来源定位
---
battery-business/src/main/java/com/battery/business/service/impl/PushIngestAdapter.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/battery-business/src/main/java/com/battery/business/service/impl/PushIngestAdapter.java b/battery-business/src/main/java/com/battery/business/service/impl/PushIngestAdapter.java
index 7645d61..f988911 100644
--- a/battery-business/src/main/java/com/battery/business/service/impl/PushIngestAdapter.java
+++ b/battery-business/src/main/java/com/battery/business/service/impl/PushIngestAdapter.java
@@ -116,8 +116,12 @@
for (TDeviceIngestChannel channel : reported == null ? List.<TDeviceIngestChannel>of() : reported)
{
Instant lastDataAt = channel.getLastDataAt() == null ? null : channel.getLastDataAt().toInstant();
+ // 来源自己的通道叫法：22 所软件按 01–30 显示，而它库里的表名比它小 1，
+ // 取数程序按现场核对过的规则补回来（见现场清单）；没报就留空，界面回退到「单元-通道」。
+ String sourceDisplayNo = channel.getVendorChannelNo() == null ? null
+ : String.valueOf(channel.getVendorChannelNo());
channels.add(new DetectedChannel(identity(channel.getDevid(), channel.getSubdevid(), channel.getChlid()),
- config.host(), true, DetectedDeviceMetadata.empty(), lastDataAt));
+ config.host(), true, DetectedDeviceMetadata.empty(), lastDataAt, sourceDisplayNo));
}
return List.copyOf(channels);
}
--
Gitblit v1.7.1