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("
" + failureNum + "、站点" + pointMatch.getSiteId() + "、点位 " + pointMatch.getDataPoint() + " 已存在");
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
failureNum++;
String msg = "
" + 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}
+
+
\ No newline at end of file