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 387b64c..dab2423 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 @@ -23,6 +23,8 @@ public class SiteDeviceListVo { private String pictureUrl; /** 唯一标识 */ private String id; + /** 父类id */ + private String parentId; public String getSiteId() { return siteId; @@ -95,4 +97,12 @@ public class SiteDeviceListVo { public void setId(String id) { this.id = id; } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml index 9b83f92..b7dadf6 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml @@ -139,7 +139,8 @@ ed.device_type as deviceType,ed.communication_status as communicationStatus, ed.device_category as deviceCategory, ed.picture_url as pictureUrl, - ed.id + ed.id, + ed.parent_id as parentId from ems_site_setting es INNER JOIN ems_devices_setting ed on es.site_id = ed.site_id where 1=1