From d468ef9941bd83cc768ecbdfa88878e6f32a8d17 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Tue, 14 Oct 2025 17:32:16 +0800
Subject: [PATCH] =?UTF-8?q?task65-=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E4=B8=8B=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xzzn/web/controller/ems/EmsSiteConfigController.java | 9 +++++++++
 .../com/xzzn/ems/mapper/EmsDevicesSettingMapper.java     | 2 +-
 .../com/xzzn/ems/service/IEmsDeviceSettingService.java   | 2 ++
 .../ems/service/impl/EmsDeviceSettingServiceImpl.java    | 6 ++++++
 .../resources/mapper/ems/EmsDevicesSettingMapper.xml     | 9 +++++++--
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
index cc3c17a..d9d419e 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteConfigController.java
@@ -152,4 +152,13 @@ public class EmsSiteConfigController extends BaseController{
         List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(request);
         return getDataTable2(result);
     }
+
+    /**
+     * 获取指定站点下的所有设备类别
+     */
+    @GetMapping("/getSiteAllDeviceCategory")
+    public AjaxResult getSiteAllDeviceCategory(String siteId)
+    {
+        return success(iEmsDeviceSettingService.getSiteAllDeviceCategory(siteId));
+    }
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java
index d46d6b0..0afbaee 100644
--- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java
+++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java
@@ -88,5 +88,5 @@ public interface EmsDevicesSettingMapper
     public List<Map<String, Object>> getClusterIdsByFuzzyQuery(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory,
                                                                @Param("parentId")String parentId);
 
-    public List<String> getDeviceIdsBySiteIdAndCategory(@Param("siteId")String siteId,@Param("deviceCategory")String deviceCategory);
+    public List<String> getAllDeviceCategoryBySiteId(String siteId);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
index 87cf5d9..eb21c9e 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsDeviceSettingService.java
@@ -26,4 +26,6 @@ public interface IEmsDeviceSettingService
     public  List<DeviceCategory> getDeviceCategory();
 
     public List<PointQueryResponse> getSingleSiteDevicePoints(PointDataRequest request);
+
+    public List<String> getSiteAllDeviceCategory(String siteId);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
index 94d6319..f558976 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
@@ -219,6 +219,12 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
                 .sorted(finalComparator)
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public List<String> getSiteAllDeviceCategory(String siteId) {
+        return emsDevicesMapper.getAllDeviceCategoryBySiteId(siteId);
+    }
+
     // 辅助方法：根据值查找对应的对象（用于比较器中获取完整对象）
     private PointQueryResponse findByValue(List<PointQueryResponse> list, Object value) {
         return list.stream()
diff --git a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml
index af5eb4f..3c666ec 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml
@@ -216,7 +216,12 @@
           and device_category = #{deviceCategory}
     </select>
 
-    <select id="getDeviceIdsBySiteIdAndCategory" resultType="java.lang.String">
-        select DISTINCT device_id   from ems_devices_setting where site_id = #{siteId} and device_category = #{deviceCategory}
+    <select id="getAllDeviceCategoryBySiteId" resultType="java.lang.String">
+        select DISTINCT device_category
+        from ems_devices_setting
+        where 1=1
+        <if test="siteId !=null and siteId !=''">
+            and site_id = #{siteId}
+        </if>
     </select>
 </mapper>
\ No newline at end of file