From 2099b94e730dc5d0e8b29ca8cf07bd71c565b889 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Tue, 23 Sep 2025 14:01:24 +0800
Subject: [PATCH] =?UTF-8?q?0918=E4=BC=98=E5=8C=96-=E5=8D=95=E7=AB=99?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=A6=96=E9=A1=B5=E6=97=A5=E6=9C=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9&=E7=82=B9=E4=BD=8D=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xzzn/web/controller/ems/EmsSiteConfigController.java | 5 +++--
 .../main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java   | 3 ++-
 .../java/com/xzzn/ems/service/IEmsDeviceSettingService.java  | 3 ++-
 .../xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java   | 4 ++--
 .../main/resources/mapper/ems/EmsBatteryClusterMapper.xml    | 2 +-
 .../src/main/resources/mapper/ems/EmsBatteryStackMapper.xml  | 2 +-
 .../src/main/resources/mapper/ems/EmsPointMatchMapper.xml    | 3 +++
 7 files changed, 14 insertions(+), 8 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 f03eb13..7727c48 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
@@ -147,9 +147,10 @@ public class EmsSiteConfigController extends BaseController{
      */
     @GetMapping("/getDevicePointList")
     public TableDataInfo getDevicePointList(@RequestParam String siteId,@RequestParam String deviceId,
-                                            @RequestParam String deviceCategory, String dataPointName)
+                                            @RequestParam String deviceCategory, String dataPointName,
+                                            String dataPoint)
     {
-        List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(siteId,deviceId,deviceCategory,dataPointName);
+        List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(siteId,deviceId,deviceCategory,dataPointName,dataPoint);
         return getDataTable2(result);
     }
 }
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 7dd6e15..0eb7085 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
@@ -121,5 +121,6 @@ public interface EmsPointMatchMapper
     // 单个站点单个设备点位查询
     public List<PointQueryResponse> getSingleSiteDevicePoints(@Param("siteId")String siteId,
                                                               @Param("deviceCategory")String deviceCategory,
-                                                              @Param("dataPointName")String dataPointName);
+                                                              @Param("dataPointName")String dataPointName,
+                                                              @Param("dataPoint")String dataPoint);
 }
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 bbd4d6a..70e3aca 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
@@ -24,5 +24,6 @@ public interface IEmsDeviceSettingService
 
     public  List<DeviceCategory> getDeviceCategory();
 
-    public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory, String dataPointName);
+    public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory,
+                                                              String dataPointName, String dataPoint);
 }
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 7d6ebe6..755d35c 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
@@ -120,8 +120,8 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
 
     @Override
     public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId,
-                                                              String deviceCategory, String dataPointName) {
-        List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory,dataPointName);
+                                                              String deviceCategory, String dataPointName,String dataPoint) {
+        List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory,dataPointName,dataPoint);
 
         // 电动所的电池簇特殊处理-来源pcs+bmsd
         if (siteId.equals(DDS_SITE_ID) && DeviceCategory.CLUSTER.getCode().equals(deviceCategory)) {
diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
index 38b7ccd..ec3eceb 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
@@ -387,7 +387,7 @@
 
     <select id="getAvgTempByHour" parameterType="com.xzzn.ems.domain.vo.DateSearchRequest" resultType="java.util.Map">
         SELECT  latest.statisDate, avg(t.avg_cell_temp) as avgTemp
-        FROM ( SELECT p.site_id, p.device_id, DATE_FORMAT( p.update_time, '%H:00') AS statisDate, MAX(p.update_time) AS max_update_time
+        FROM ( SELECT p.site_id, p.device_id, DATE_FORMAT( p.update_time, '%Y-%m-%d %H:00') AS statisDate, MAX(p.update_time) AS max_update_time
                FROM ems_battery_cluster p
                <include refid="statisCommonFilter"/>
                GROUP BY p.site_id, p.device_id, statisDate
diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
index 2467e79..c2520e3 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
@@ -449,7 +449,7 @@
                 avg(t.stack_soc) as avgSoc,
                 avg(t.stack_soh) as avgSoh,
                 avg(t.avg_temperature) as avgTemp
-        from  ( SELECT p.site_id,  p.device_id, DATE_FORMAT(p.update_time, '%H:00') AS dateHour,MAX(p.update_time) as max_update_time
+        from  ( SELECT p.site_id,  p.device_id, DATE_FORMAT(p.update_time, '%Y-%m-%d %H:00') AS dateHour,MAX(p.update_time) as max_update_time
                 FROM ems_battery_stack p
                 <include refid="statisCommonFilter"/>
         GROUP BY p.site_id,p.device_id,dateHour
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
index ed73fe0..1bf9b03 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
@@ -335,5 +335,8 @@
         <if test="dataPointName != null and dataPointName != ''">
             and t.data_point_name like CONCAT('%', #{dataPointName}, '%')
         </if>
+        <if test="dataPoint != null and dataPoint != ''">
+            and t.data_point like CONCAT('%', #{dataPoint}, '%')
+        </if>
     </select>
 </mapper>
\ No newline at end of file