From b70814984096f1ff64bf0a6e69123e2bdbced9c3 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 29 五月 2025 11:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 f571cf5..b4f7fb8 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -427,7 +428,7 @@
// 2. 遍历，逐个创建 or 更新
PointImportRespVO respVO = PointImportRespVO.builder().createPointnames(new ArrayList<>())
.updatePointnames(new ArrayList<>()).failurePointnames(new LinkedHashMap<>()).build();
- importPoints.forEach(importPoint -> {
+ for(PointImportExcelVO importPoint : importPoints) {
// 判断如果不存在，再进行插入
DaPointEntity existPoint = null;
if (StringUtils.isNotBlank(importPoint.getPointNo())) {
@@ -439,6 +440,9 @@
daPointEntity.setId(UUID.randomUUID().toString());
daPointEntity.setIsEnable(CommonConstant.IS_ENABLE);
daPointEntity.setCreateTime(new Date());
+ if(PointTypeEnum.getEumByCode(daPointEntity.getPointType()) == null) {
+ continue;
+ }
switch (PointTypeEnum.getEumByCode(daPointEntity.getPointType())) {
case MEASURE_POINT:
DaMeasurePointDTO measurePoint = new DaMeasurePointDTO();
@@ -462,6 +466,7 @@
cumulatePoint.setMomentPoint(importPoint.getMomentPoint());
cumulatePoint.setLength(importPoint.getLength());
cumulatePoint.setDivisor(importPoint.getDivisor());
+ cumulatePoint.setIsCumuNeg(importPoint.getIsCumuNeg());
daCumulatePointService.add(cumulatePoint, daPointEntity.getId());
daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_L.name()));
default:
@@ -471,13 +476,13 @@
daPointDao.insert(daPointEntity);
daPointCollectStatusService.add(daPointEntity.getPointNo());
respVO.getCreatePointnames().add(importPoint.getPointName());
- return;
+ continue;
}
// 如果存在，判断是否允许更新
if (!isUpdateSupport) {
respVO.getFailurePointnames().put(importPoint.getPointName(), POINT_EXISTS.getMsg());
- return;
+ continue;
}
DaPointEntity updatePoint = BeanUtils.toBean(importPoint, DaPointEntity.class);
@@ -490,8 +495,6 @@
measurePoint.setSourceId(sourcesIdMap.get(importPoint.getSourceType()).get(importPoint.getSourceName()));
measurePoint.setTagNo(importPoint.getTagNo());
daMeasurePointService.update(measurePoint, new QueryWrapper<DaMeasurePointEntity>().eq("point_id",updatePoint.getId()));
-
-
break;
case CALCULATE_POINT:
break;
@@ -499,7 +502,7 @@
break;
}
respVO.getUpdatePointnames().add(importPoint.getPointName());
- });
+ }
return respVO;
}
--
Gitblit v1.9.3