From 213afc8ee0fea62ce448db3539e0eb5ed2031982 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 17 一月 2025 16:12:54 +0800
Subject: [PATCH] 导入通过PointNo判断是否重复

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java |    8 ++++++--
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java                  |    7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
index e5589c2..771f23b 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
@@ -3,15 +3,12 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
 import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
-import com.iailab.module.data.api.point.dto.ApiPointDTO;
 import com.iailab.module.data.point.dto.DaPointDTO;
 import com.iailab.module.data.point.entity.DaPointEntity;
 import com.iailab.module.data.point.vo.DaPointPageReqVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,4 +40,8 @@
     default DaPointEntity selectByPointName(String pointName) {
         return selectOne("point_name", pointName);
     }
+
+    default DaPointEntity selectByPointNo(String pointNo) {
+        return selectOne("point_no", pointNo);
+    }
 }
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
index cd92b2b..48dcf01 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java
@@ -29,6 +29,7 @@
 import com.iailab.module.data.point.vo.PointImportExcelVO;
 import com.iailab.module.data.point.vo.PointImportRespVO;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -395,9 +396,12 @@
         PointImportRespVO respVO = PointImportRespVO.builder().createPointnames(new ArrayList<>())
                 .updatePointnames(new ArrayList<>()).failurePointnames(new LinkedHashMap<>()).build();
         importPoints.forEach(importPoint -> {
-
             // 判断如果不存在,再进行插入
-            DaPointEntity existPoint = baseDao.selectByPointName(importPoint.getPointName());
+            DaPointEntity existPoint = null;
+            if (StringUtils.isNotBlank(importPoint.getPointNo())) {
+                existPoint = baseDao.selectByPointNo(importPoint.getPointNo());
+            }
+
             if (existPoint == null) {
                 DaPointEntity daPointEntity = ConvertUtils.sourceToTarget(importPoint, DaPointEntity.class);
                 daPointEntity.setId(UUID.randomUUID().toString());

--
Gitblit v1.9.3