From 51e6936d77256451d3023e2fcfc6da625b3b22db Mon Sep 17 00:00:00 2001 From: mashili Date: Fri, 18 Jul 2025 10:35:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8-=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=96=B0=E5=A2=9EparentId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xzzn/ems/domain/vo/SiteDeviceListVo.java | 10 ++++++++++ .../main/resources/mapper/ems/EmsSiteSettingMapper.xml | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) 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