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