fix:委托方大屏接口设备增加type字段返回

“mitao”

2026-01-23 b2893120939390f1a4468ff52813b47bbda44444

fix:委托方大屏接口设备增加type字段返回

 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);
    }

 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();

 ruoyi-system/src/main/java/com/ruoyi/system/vo/DeviceCountVo.java

@@ -12,4 +12,7 @@

    @ApiModelProperty("设备类型")
    private Integer type;

    @ApiModelProperty("设备名称")
    private String name;
}

 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;