From 97c667bd77786368a47f31e917e5c6651322a106 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Tue, 29 Jul 2025 18:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A0=86=E4=B8=8B=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E7=B0=87=E5=88=97=E8=A1=A8=E5=85=A5=E5=8F=82+?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xzzn/web/controller/ems/EmsSiteMonitorController.java | 4 ++--
 .../src/main/java/com/xzzn/ems/service/IEmsSiteService.java   | 2 +-
 .../java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
index 09928e2..700677c 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
@@ -123,9 +123,9 @@ public class EmsSiteMonitorController extends BaseController{
      * 获取所有电池簇
      */
     @GetMapping("/getClusterNameList")
-    public AjaxResult getClusterNameList(@RequestParam String stackDeviceId)
+    public AjaxResult getClusterNameList(@RequestParam String siteId, @RequestParam String stackDeviceId)
     {
-        return success(iEmsSiteService.getAllClusterInfo(stackDeviceId));
+        return success(iEmsSiteService.getAllClusterInfo(siteId, stackDeviceId));
     }
 
     /**
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 51a7a05..c2acc64 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
@@ -21,7 +21,7 @@ public interface IEmsSiteService
 
     public List<Map<String,Object>> getAllStackInfo(String siteId);
 
-    public List<Map<String,Object>> getAllClusterInfo(String stackDeviceId);
+    public List<Map<String,Object>> getAllClusterInfo(String siteId, String stackDeviceId);
 
     public List<EmsSiteSetting> getAllSiteInfoList(String siteName, String startTime, String endTime);
 
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 1aee491..d88adfe 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
@@ -52,8 +52,8 @@ public class EmsSiteServiceImpl implements IEmsSiteService
      * @return
      */
     @Override
-    public List<Map<String, Object>> getAllClusterInfo(String parentId) {
-        return emsDevicesMapper.getDeviceInfoByParentId(null,parentId);
+    public List<Map<String, Object>> getAllClusterInfo(String siteId, String parentId) {
+        return emsDevicesMapper.getDeviceInfoByParentId(siteId,parentId);
     }
 
     /**