From e93f9cc6b8310fa3aad449de7f4e031a21b99ea8 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Thu, 18 Sep 2025 18:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE20250916=E4=BC=98=E5=8C=96-?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E5=90=8D=E7=A7=B0=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

---
 .../xzzn/web/controller/ems/EmsSiteConfigController.java   | 5 +++--
 .../main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java | 4 +++-
 .../com/xzzn/ems/service/IEmsDeviceSettingService.java     | 2 +-
 .../xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java | 5 +++--
 .../src/main/resources/mapper/ems/EmsPointMatchMapper.xml  | 7 +++++--
 5 files changed, 15 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 3f152b8..f03eb13 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
@@ -146,9 +146,10 @@ public class EmsSiteConfigController extends BaseController{
      * 单个站点单个设备点位查询
      */
     @GetMapping("/getDevicePointList")
-    public TableDataInfo getDevicePointList(@RequestParam String siteId,@RequestParam String deviceId,@RequestParam String deviceCategory)
+    public TableDataInfo getDevicePointList(@RequestParam String siteId,@RequestParam String deviceId,
+                                            @RequestParam String deviceCategory, String dataPointName)
     {
-        List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(siteId,deviceId,deviceCategory);
+        List<PointQueryResponse> result = iEmsDeviceSettingService.getSingleSiteDevicePoints(siteId,deviceId,deviceCategory,dataPointName);
         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 fd1c646..7dd6e15 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
@@ -119,5 +119,7 @@ public interface EmsPointMatchMapper
                                                               @Param("deviceId")String deviceId);
 
     // 单个站点单个设备点位查询
-    public List<PointQueryResponse> getSingleSiteDevicePoints(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory);
+    public List<PointQueryResponse> getSingleSiteDevicePoints(@Param("siteId")String siteId,
+                                                              @Param("deviceCategory")String deviceCategory,
+                                                              @Param("dataPointName")String dataPointName);
 }
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 dcecb19..bbd4d6a 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,5 @@ public interface IEmsDeviceSettingService
 
     public  List<DeviceCategory> getDeviceCategory();
 
-    public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory);
+    public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory, String dataPointName);
 }
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 ee537ee..7d6ebe6 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
@@ -119,8 +119,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
     }
 
     @Override
-    public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId, String deviceCategory) {
-        List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory);
+    public List<PointQueryResponse> getSingleSiteDevicePoints(String siteId, String deviceId,
+                                                              String deviceCategory, String dataPointName) {
+        List<PointQueryResponse> response = emsPointMatchMapper.getSingleSiteDevicePoints(siteId,deviceCategory,dataPointName);
 
         // 电动所的电池簇特殊处理-来源pcs+bmsd
         if (siteId.equals(DDS_SITE_ID) && DeviceCategory.CLUSTER.getCode().equals(deviceCategory)) {
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
index 7b6b290..ed73fe0 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
@@ -327,10 +327,13 @@
         from ems_point_match t
         where 1=1
         <if test="siteId != null and siteId != ''">
-            and site_id = #{siteId}
+            and t.site_id = #{siteId}
         </if>
         <if test="deviceCategory != null and deviceCategory != ''">
-            and device_category = #{deviceCategory}
+            and t.device_category = #{deviceCategory}
+        </if>
+        <if test="dataPointName != null and dataPointName != ''">
+            and t.data_point_name like CONCAT('%', #{dataPointName}, '%')
         </if>
     </select>
 </mapper>
\ No newline at end of file