From 15b964b4cefc1070800aafd856311ea770d71736 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Tue, 14 Oct 2025 17:07:00 +0800
Subject: [PATCH] =?UTF-8?q?task66-=E5=8D=95=E4=BD=93=E7=94=B5=E6=B1=A0?=
 =?UTF-8?q?=E8=B0=83=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E6=9B=B2=E7=BA=BF=E6=8E=A5=E5=8F=A3-=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=B0=87id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xzzn/ems/mapper/EmsPointMatchMapper.java    | 9 ++++++---
 .../xzzn/ems/service/impl/GeneralQueryServiceImpl.java   | 7 ++++---
 .../main/resources/mapper/ems/EmsPointMatchMapper.xml    | 3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java
index 2807b09..b3d4f72 100644
--- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java
+++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java
@@ -80,21 +80,24 @@ public interface EmsPointMatchMapper
                                                               @Param("tableField")String tableField,
                                                               @Param("startDate")Date startDate,
                                                               @Param("endDate")Date endDate,
-                                                              @Param("params") Map<String, List<String>> params);
+                                                              @Param("params") Map<String, List<String>> params,
+                                                              @Param("clusterDeviceId")String clusterDeviceId);
     // 根据条件查询数据-按小时-单体电池特殊处理
     public List<GeneralQueryDataVo> getBatteryPointDataByHours(@Param("siteIds")List<String> siteIds,
                                                             @Param("tableName")String tableName,
                                                             @Param("tableField")String tableField,
                                                             @Param("startDate") Date startDate,
                                                             @Param("endDate")Date endDate,
-                                                            @Param("params") Map<String, List<String>> params);
+                                                            @Param("params") Map<String, List<String>> params,
+                                                            @Param("clusterDeviceId")String clusterDeviceId);
     // 根据条件查询数据-按天-单体电池特殊处理
     public List<GeneralQueryDataVo> getBatteryPointDataByDays(@Param("siteIds")List<String> siteIds,
                                                            @Param("tableName")String tableName,
                                                            @Param("tableField")String tableField,
                                                            @Param("startDate")Date startDate,
                                                            @Param("endDate")Date endDate,
-                                                            @Param("params") Map<String, List<String>> params);
+                                                           @Param("params") Map<String, List<String>> params,
+                                                           @Param("clusterDeviceId")String clusterDeviceId);
 
     // 根据条件查询数据-按分钟-其他设备
     public List<GeneralQueryDataVo> getCommonPointDataByMinutes(@Param("siteIds")List<String> siteIds,
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java
index 0fadf9b..cb1724e 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java
@@ -158,12 +158,13 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
         List<GeneralQueryDataVo> dataVoList = new ArrayList<>();
 
         int dataUnit = request.getDataUnit();
+        String clusterDeviceId = request.getDeviceId();
         Date startDate   = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,request.getStartDate());
         Date endDate   = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,request.getEndDate());
         Map<String,List<String>> siteDeviceMap = request.getSiteDeviceMap();
         if (dataUnit == 1) { // 分钟
             startDate = DateUtils.adjustToStartOfMinutes(request.getStartDate());
-            dataVoList = emsPointMatchMapper.getBatteryPointDataByMinutes(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap);
+            dataVoList = emsPointMatchMapper.getBatteryPointDataByMinutes(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap,clusterDeviceId);
             if (dataVoList != null && dataVoList.size() > 0) {
                 dataVoList = dealWithBatteryMinutesData(querySiteIds,dataVoList,deviceCategory,
                         request.getStartDate(),request.getEndDate(),siteDeviceMap);
@@ -171,11 +172,11 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
         } else if (dataUnit == 2) { // 小时
             startDate = DateUtils.adjustToStartOfHour(request.getStartDate());
             tableName = "ems_battery_data_hour";
-            dataVoList = emsPointMatchMapper.getBatteryPointDataByHours(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap);
+            dataVoList = emsPointMatchMapper.getBatteryPointDataByHours(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap,clusterDeviceId);
         } else if (dataUnit == 3) { // 天
             endDate = DateUtils.adjustToEndOfDay(request.getEndDate());
             tableName = "ems_battery_data_day";
-            dataVoList = emsPointMatchMapper.getBatteryPointDataByDays(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap);
+            dataVoList = emsPointMatchMapper.getBatteryPointDataByDays(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap,clusterDeviceId);
         }
         // 数据转换
         result =  convertBatteryToResultList(dataVoList);
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
index ce80d20..f29c14d 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
@@ -165,6 +165,9 @@
     </select>
 
     <sql id="commonFilter">
+        <if test="clusterDeviceId != null and clusterDeviceId != ''">
+            and cluster_device_id = #{clusterDeviceId}
+        </if>
         <choose>
             <when test="params != null and !params.isEmpty()">
                 AND ( <trim prefixOverrides="OR">