dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
264 changed files with 32048 additions and 1055 deletions
Showing only changes of commit b776f6ff76 - Show all commits

View File

@ -73,4 +73,13 @@ public enum DeviceCategory
} }
return null; return null;
} }
public static String getInfoByCode(String code) {
for (DeviceCategory category : DeviceCategory.values()) {
if (category.code.equals(code)) {
return category.info;
}
}
return null;
}
} }

View File

@ -27,6 +27,16 @@ public class SiteDeviceListVo {
private String parentId; private String parentId;
/** 单体电池个数-仅stack设备下有 */ /** 单体电池个数-仅stack设备下有 */
private int batteryNum; private int batteryNum;
/** 设备类型名称 */
private String categoryName;
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getSiteId() { public String getSiteId() {
return siteId; return siteId;

View File

@ -93,6 +93,8 @@ public class EmsSiteServiceImpl implements IEmsSiteService
List<EmsBatteryData> batteryDataList = redisCache.getCacheList(RedisKeyConstants.BATTERY + siteId + "_" + clusterId); List<EmsBatteryData> batteryDataList = redisCache.getCacheList(RedisKeyConstants.BATTERY + siteId + "_" + clusterId);
siteDeviceListVo.setBatteryNum(batteryDataList == null ? 0 : batteryDataList.size()); siteDeviceListVo.setBatteryNum(batteryDataList == null ? 0 : batteryDataList.size());
} }
String categoryName = DeviceCategory.getInfoByCode(deviceCategory);
siteDeviceListVo.setCategoryName(categoryName);
} }
return resultData; return resultData;
} }