From b776f6ff7664e6f5db6d88e2a737f8dd0d796c7a Mon Sep 17 00:00:00 2001 From: mashili Date: Tue, 21 Oct 2025 15:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=88=97?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=98=BE=E7=A4=BA=E8=AE=BE=E5=A4=87=E7=B1=BB?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xzzn/common/enums/DeviceCategory.java | 9 +++++++++ .../java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java | 10 ++++++++++ .../com/xzzn/ems/service/impl/EmsSiteServiceImpl.java | 2 ++ 3 files changed, 21 insertions(+) diff --git a/ems-common/src/main/java/com/xzzn/common/enums/DeviceCategory.java b/ems-common/src/main/java/com/xzzn/common/enums/DeviceCategory.java index 1b7c55f..c90aca1 100644 --- a/ems-common/src/main/java/com/xzzn/common/enums/DeviceCategory.java +++ b/ems-common/src/main/java/com/xzzn/common/enums/DeviceCategory.java @@ -73,4 +73,13 @@ public enum DeviceCategory } return null; } + + public static String getInfoByCode(String code) { + for (DeviceCategory category : DeviceCategory.values()) { + if (category.code.equals(code)) { + return category.info; + } + } + return null; + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java index 5ddddf8..ba37363 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java @@ -27,6 +27,16 @@ public class SiteDeviceListVo { private String parentId; /** 单体电池个数-仅stack设备下有 */ private int batteryNum; + /** 设备类型名称 */ + private String categoryName; + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } public String getSiteId() { return siteId; diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java index 23844e0..9819c8c 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java @@ -93,6 +93,8 @@ public class EmsSiteServiceImpl implements IEmsSiteService List batteryDataList = redisCache.getCacheList(RedisKeyConstants.BATTERY + siteId + "_" + clusterId); siteDeviceListVo.setBatteryNum(batteryDataList == null ? 0 : batteryDataList.size()); } + String categoryName = DeviceCategory.getInfoByCode(deviceCategory); + siteDeviceListVo.setCategoryName(categoryName); } return resultData; }