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 41ec25b..b0bf2a4 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
@@ -54,10 +54,11 @@ public class EmsSiteConfigController extends BaseController{
      * 获取设备列表-分页
      */
     @GetMapping("/getDeviceInfoList")
-    public TableDataInfo getDeviceInfoList(@RequestParam String siteId)
+    public TableDataInfo getDeviceInfoList(@RequestParam String siteId,
+                                           @RequestParam String deviceCategory)
     {
         startPage();
-        List<SiteDeviceListVo> list = iEmsSiteService.getAllDeviceList(siteId);
+        List<SiteDeviceListVo> list = iEmsSiteService.getAllDeviceList(siteId, deviceCategory);
         return getDataTable(list);
     }
 
@@ -76,7 +77,7 @@ public class EmsSiteConfigController extends BaseController{
     @GetMapping("/getDeviceList")
     public AjaxResult getDeviceInfoList2(@RequestParam String siteId)
     {
-        return success(iEmsSiteService.getAllDeviceList(siteId));
+        return success(iEmsSiteService.getAllDeviceList(siteId, null));
     }
 
     /**
diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
index f29e394..931ff3d 100644
--- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
+++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
@@ -89,7 +89,7 @@ public interface EmsSiteSettingMapper
      * 获取站点的设备列表
      * @return
      */
-    public List<SiteDeviceListVo> getAllSiteDeviceList(String siteId);
+    public List<SiteDeviceListVo> getAllSiteDeviceList(@Param("siteId") String siteId, @Param("deviceCategory") String deviceCategory);
 
     public List<String> getAllSiteId();
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
index 11c8cda..ed853ac 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
@@ -25,7 +25,7 @@ public interface IEmsSiteService
 
     public List<EmsSiteSetting> getAllSiteInfoList(String siteName, String startTime, String endTime);
 
-    public List<SiteDeviceListVo> getAllDeviceList(String siteId);
+    public List<SiteDeviceListVo> getAllDeviceList(String siteId, String deviceCategory);
 
     public List<Map<String,Object>> getAllPcsInfo(String siteId);
 
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
index 9819c8c..ea6ccde 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
@@ -80,20 +80,20 @@ public class EmsSiteServiceImpl implements IEmsSiteService
      * @return
      */
     @Override
-    public List<SiteDeviceListVo> getAllDeviceList(String siteId) {
-        List<SiteDeviceListVo> resultData = emsSiteMapper.getAllSiteDeviceList(siteId);
+    public List<SiteDeviceListVo> getAllDeviceList(String siteId, String deviceCategory) {
+        List<SiteDeviceListVo> resultData = emsSiteMapper.getAllSiteDeviceList(siteId, deviceCategory);
         if(resultData == null || resultData.size() == 0){
             return resultData;
         }
         for (SiteDeviceListVo siteDeviceListVo : resultData) {
             String clusterId = siteDeviceListVo.getDeviceId();
-            String deviceCategory = siteDeviceListVo.getDeviceCategory();
-            if(DeviceCategory.CLUSTER.getCode().equals(deviceCategory)){
+            String category = siteDeviceListVo.getDeviceCategory();
+            if(DeviceCategory.CLUSTER.getCode().equals(category)){
                 // 获取该stack下面有多少单体电池
                 List<EmsBatteryData> batteryDataList = redisCache.getCacheList(RedisKeyConstants.BATTERY + siteId + "_" + clusterId);
                 siteDeviceListVo.setBatteryNum(batteryDataList == null ? 0 : batteryDataList.size());
             }
-            String categoryName = DeviceCategory.getInfoByCode(deviceCategory);
+            String categoryName = DeviceCategory.getInfoByCode(category);
             siteDeviceListVo.setCategoryName(categoryName);
         }
         return resultData;
diff --git a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml
index 1d1d2ad..e2c5fd3 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsSiteSettingMapper.xml
@@ -146,6 +146,9 @@
         <if test="siteId != null and siteId != ''">
             and es.site_id = #{siteId}
         </if>
+        <if test="deviceCategory != null and deviceCategory != ''">
+            and ed.device_category = #{deviceCategory}
+        </if>
     </select>
 
     <select id="getAllSiteId"  resultType="String">