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 fc37793..3ba4110 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
@@ -168,4 +168,13 @@ public class EmsSiteConfigController extends BaseController{
     {
         return success(iEmsSiteService.getParentCategoryDeviceId(siteId, deviceCategory));
     }
+
+    /**
+     * 获取指定站点下的指定设备类型的设备
+     */
+    @GetMapping("/getDeviceListBySiteAndCategory")
+    public AjaxResult getDeviceListBySiteAndCategory(String siteId,String deviceCategory)
+    {
+        return success(iEmsDeviceSettingService.getDeviceListBySiteAndCategory(siteId, deviceCategory));
+    }
 }
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 9540a9b..60aca5e 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
@@ -31,4 +31,6 @@ public interface IEmsDeviceSettingService
     public List<String> getSiteAllDeviceCategory(String siteId);
     // 初始化设备信息
     public Map<String, List<EmsDevicesSetting>> initDeviceInfo();
+
+    public List<Map<String, Object>> getDeviceListBySiteAndCategory(String siteId, String deviceCategory);
 }
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 dc02593..5d3d2a9 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
@@ -445,4 +445,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
         redisCache.setCacheObject(RedisKeyConstants.INIT_DEVICE_INFO,  map, 30, TimeUnit.DAYS);
         return map;
     }
+
+    @Override
+    public List<Map<String, Object>> getDeviceListBySiteAndCategory(String siteId, String deviceCategory) {
+        return emsDevicesMapper.getDeviceInfosBySiteIdAndCategory(siteId, deviceCategory);
+    }
 }