设备列表-返回新增parentId

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

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
         <if test="siteId != null and siteId != ''">