From 24996ea75ec4ca3b7d154387bfe37ec9dd387255 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 29 五月 2025 14:40:05 +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 | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 12 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 beada3c..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;
@@ -29,6 +30,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;
@@ -60,6 +62,9 @@
@Autowired
private DaSequenceNumService daSequenceNumService;
+
+ @Autowired
+ private DaExtremalPointService daExtremalPointService;
@Resource
private DaPointDao daPointDao;
@@ -107,6 +112,9 @@
break;
case CUMULATE:
result.setCumulatePoint(daCumulatePointService.getByPoint(id));
+ break;
+ case EXTREMAL:
+ result.setExtremalPoint(daExtremalPointService.getByPoint(id));
break;
default:
break;
@@ -163,7 +171,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));
@@ -180,6 +188,10 @@
case CUMULATE:
daCumulatePointService.add(dataPoint.getCumulatePoint(), daPointEntity.getId());
daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_L.name()));
+ break;
+ case EXTREMAL:
+ daExtremalPointService.add(dataPoint.getExtremalPoint(), daPointEntity.getId());
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_E.name()));
break;
default:
break;
@@ -213,6 +225,9 @@
case CUMULATE:
daCumulatePointService.update(dataPoint.getCumulatePoint());
break;
+ case EXTREMAL:
+ daExtremalPointService.update(dataPoint.getExtremalPoint());
+ break;
default:
break;
}
@@ -227,6 +242,7 @@
daMeasurePointService.deleteByPoint(ids);
daMathPointService.deleteByPoint(ids);
daCumulatePointService.deleteByPoint(ids);
+ daExtremalPointService.deleteByPoint(ids);
// 清空缓存
clearCache();
}
@@ -353,6 +369,24 @@
}
@Override
+ public List<DaPointDTO> getExtremalPoint(String freq) {
+ Map<String, Object> params = new HashMap<>(3);
+ params.put("pointType", PointTypeEnum.EXTREMAL.getCode());
+ params.put("isEnable", CommonConstant.IS_ENABLE);
+ params.put("minfreqid", freq);
+ return daPointDao.getExtremalPoint(params);
+ }
+
+ @Override
+ public List<DaPointDTO> getExtremalPoint(List<String> pointNos) {
+ Map<String, Object> params = new HashMap<>(3);
+ params.put("pointType", PointTypeEnum.EXTREMAL.getCode());
+ params.put("isEnable", CommonConstant.IS_ENABLE);
+ params.put("pointNos", pointNos);
+ return daPointDao.getExtremalPoint(params);
+ }
+
+ @Override
public DaPointDTO getByNo(String pointNo) {
if (pointNoMap.containsKey(pointNo)) {
return pointNoMap.get(pointNo);
@@ -394,15 +428,21 @@
// 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 = 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());
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();
@@ -426,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:
@@ -435,25 +476,33 @@
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);
updatePoint.setId(existPoint.getId());
baseDao.updateById(updatePoint);
- DaMeasurePointEntity measurePoint = new DaMeasurePointEntity();
- measurePoint.setSourceType(importPoint.getSourceType());
- measurePoint.setSourceId(sourcesIdMap.get(importPoint.getSourceType()).get(importPoint.getSourceName()));
- measurePoint.setTagNo(importPoint.getTagNo());
- daMeasurePointService.update(measurePoint, new QueryWrapper<DaMeasurePointEntity>().eq("point_id",updatePoint.getId()));
+ switch (PointTypeEnum.getEumByCode(updatePoint.getPointType())) {
+ case MEASURE_POINT:
+ DaMeasurePointEntity measurePoint = new DaMeasurePointEntity();
+ measurePoint.setSourceType(importPoint.getSourceType());
+ 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;
+ default:
+ break;
+ }
respVO.getUpdatePointnames().add(importPoint.getPointName());
- });
+ }
return respVO;
}
--
Gitblit v1.9.3