From b2893120939390f1a4468ff52813b47bbda44444 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 23 一月 2026 16:53:57 +0800
Subject: [PATCH] fix:委托方大屏接口设备增加type字段返回
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
index 11c5ca8..80c1689 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
@@ -471,6 +471,16 @@
vo.setName(entry.getKey());
vo.setTotal(entry.getValue().size());
+ // 设置设备类型字段
+ // 从当前分组的第一个设备使用记录中获取设备类型
+ if (!entry.getValue().isEmpty()) {
+ DeviceUsage firstUsage = entry.getValue().get(0);
+ Device device = finalDeviceMap.get(firstUsage.getDeviceId());
+ if (device != null && device.getType() != null) {
+ vo.setType(device.getType());
+ }
+ }
+
long inspectedCount = entry.getValue().stream()
.filter(d -> deviceInspectionMap.getOrDefault(d.getId(), false))
.count();
--
Gitblit v1.7.1