From 72c7c0c3e0d1b9049a722624125ebdc0804318a2 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Thu, 6 Nov 2025 15:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=B8=85=E5=8D=95-=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xzzn/ems/mapper/EmsPointMatchMapper.java    | 2 +-
 .../xzzn/ems/service/impl/EmsPointMatchServiceImpl.java  | 9 +++------
 .../main/resources/mapper/ems/EmsPointMatchMapper.xml    | 7 +++++++
 3 files changed, 11 insertions(+), 7 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 27f9497..19a1f29 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
@@ -139,5 +139,5 @@ public interface EmsPointMatchMapper
                                                            @Param("ipPort")Integer ipPort);
 
     // 根据站点，设备类别，点位，获取唯一数据
-    public EmsPointMatch getUniquePoint(String siteId, String deviceCategory, String dataPoint);
+    public EmsPointMatch getUniquePoint(@Param("siteId")String siteId, @Param("deviceCategory")String deviceCategory, @Param("dataPoint")String dataPoint);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java
index 5cfc126..25942cb 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsPointMatchServiceImpl.java
@@ -56,10 +56,8 @@ public class EmsPointMatchServiceImpl implements IEmsPointMatchService
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
-        for (EmsPointMatch pointMatch : pointMatchList)
-        {
-            try
-            {
+        for (EmsPointMatch pointMatch : pointMatchList) {
+            try {
                 // 验证点位是否存在
                 EmsPointMatch point = emsPointMatchMapper.getUniquePoint(pointMatch.getSiteId(),
                         pointMatch.getDeviceCategory(),pointMatch.getDataPoint());
@@ -79,8 +77,7 @@ public class EmsPointMatchServiceImpl implements IEmsPointMatchService
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、站点" + pointMatch.getSiteId() + "、点位 " + pointMatch.getDataPoint() + " 已存在");
                 }
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、站点" + pointMatch.getSiteId() + "、点位 " + pointMatch.getDataPoint() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
index 4e1f76f..c0560cf 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
@@ -419,4 +419,11 @@
             and tmp.ipPort = #{ipPort}
         </if>
     </select>
+
+    <select id="getUniquePoint" resultMap="EmsPointMatchResult">
+        <include refid="selectEmsPointMatchVo"/>
+        where site_id = #{siteId}
+        and device_category = #{deviceCategory}
+        and data_point = #{dataPoint}
+    </select>
 </mapper>
\ No newline at end of file