From bc8a34add41098d482224b5b549d624a5b7f9011 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 08 五月 2025 17:06:38 +0800
Subject: [PATCH] ArcDataApi 测点新增 平滑尺度 值类型 为空的bug
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
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..96220b7 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;
@@ -163,7 +164,7 @@
daPointEntity.setId(UUID.randomUUID().toString());
switch (PointTypeEnum.getEumByCode(dataPoint.getPointType())) {
case MEASURE_POINT:
- DaMeasurePointDTO measurePoint = new DaMeasurePointDTO();
+ DaMeasurePointDTO measurePoint = dataPoint.getMeasurePoint();
measurePoint.setSourceType(dataPoint.getSourceOption().get(0));
measurePoint.setSourceId(dataPoint.getSourceOption().get(1));
measurePoint.setTagNo(dataPoint.getSourceOption().get(2));
@@ -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