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-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 4 ++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/MachineryStatisticsVO.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceCountVo.java | 3 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java | 10 ++++++++++
4 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
index 8b9b6b4..3c070fa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -105,6 +105,10 @@
projectVo.setCheckTime(task.getUpdateTime());
}
List<DeviceCountVo> list = deviceUsageService.getProjectDeviceCount(id);
+ list.forEach(item->{
+ DeviceType value = DeviceType.values()[item.getType()];
+ item.setName(value.getDesc());
+ });
projectVo.setDeviceCountVos(list);
return R.ok(projectVo);
}
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();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceCountVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceCountVo.java
index f7c1bd8..8a48664 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceCountVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceCountVo.java
@@ -12,4 +12,7 @@
@ApiModelProperty("设备类型")
private Integer type;
+
+ @ApiModelProperty("设备名称")
+ private String name;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/MachineryStatisticsVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/MachineryStatisticsVO.java
index 28ae4fa..b5a6c75 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/MachineryStatisticsVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/MachineryStatisticsVO.java
@@ -13,6 +13,8 @@
@Data
@ApiModel("机械设备统计数据")
public class MachineryStatisticsVO {
+ @ApiModelProperty("设备类型")
+ private Integer type;
@ApiModelProperty("设备名称")
private String name;
--
Gitblit v1.7.1