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 | 94 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 74 insertions(+), 20 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 c5b0f3d..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
@@ -6,9 +6,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iailab.framework.common.constant.Constant;
import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.channel.common.service.ChannelSourceService;
import com.iailab.module.data.common.enums.CommonConstant;
import com.iailab.module.data.common.enums.IsEnableEnum;
@@ -26,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;
@@ -44,7 +48,7 @@
* @createTime 2024年09月2日
*/
@Service
-public class DaPointServiceImpl extends ServiceImpl<DaPointDao, DaPointEntity> implements DaPointService {
+public class DaPointServiceImpl extends BaseServiceImpl<DaPointDao, DaPointEntity> implements DaPointService {
@Autowired
private DaMeasurePointService daMeasurePointService;
@@ -64,7 +68,10 @@
@Resource
private ChannelSourceService channelSourceService;
- private static Map<String, DaPointDTO> pointIdMap = new ConcurrentHashMap<>();
+ @Resource
+ private DaPointCollectStatusService daPointCollectStatusService;
+
+ private static Map<String, ApiPointDTO> pointIdMap = new ConcurrentHashMap<>();
private static Map<String, DaPointDTO> pointNoMap = new ConcurrentHashMap<>();
@@ -109,22 +116,22 @@
}
@Override
- public DaPointDTO getSimpleInfoById(String id) {
+ public ApiPointDTO getSimpleInfoById(String id) {
if (pointIdMap.containsKey(id)) {
return pointIdMap.get(id);
}
- DaPointDTO dto = ConvertUtils.sourceToTarget(daPointDao.selectById(id), DaPointDTO.class);
+ ApiPointDTO dto = ConvertUtils.sourceToTarget(daPointDao.selectById(id), ApiPointDTO.class);
if (dto == null) {
return null;
}
pointIdMap.put(id, dto);
- return pointIdMap.get(id);
+ return dto;
}
@Override
public DaPointDTO getSimpleInfoByNo(String no) {
- QueryWrapper<DaPointEntity> queryWrapper = new QueryWrapper();
- queryWrapper.eq("pointNo", no);
+ QueryWrapper<DaPointEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("point_no", no);
return ConvertUtils.sourceToTarget(daPointDao.selectOne(queryWrapper), DaPointDTO.class);
}
@@ -182,6 +189,7 @@
daPointEntity.setCreateTime(new Date());
daPointDao.insert(daPointEntity);
+ daPointCollectStatusService.add(daPointEntity.getPointNo());
// 清空缓存
clearCache();
}
@@ -215,10 +223,11 @@
@Override
@DSTransactional(rollbackFor = Exception.class)
- public void delete(String[] id) {
- daPointDao.deleteBatchIds(Arrays.asList(id));
- daMeasurePointService.deleteByPoint(id);
- daMathPointService.deleteByPoint(id);
+ public void delete(String[] ids) {
+ daPointDao.deleteBatchIds(Arrays.asList(ids));
+ daMeasurePointService.deleteByPoint(ids);
+ daMathPointService.deleteByPoint(ids);
+ daCumulatePointService.deleteByPoint(ids);
// 清空缓存
clearCache();
}
@@ -318,6 +327,33 @@
}
@Override
+ public List<DaPointDTO> getCumulatePoint(String freq) {
+ Map<String, Object> params = new HashMap<>(3);
+ params.put("pointType", PointTypeEnum.CUMULATE.getCode());
+ params.put("isEnable", CommonConstant.IS_ENABLE);
+ params.put("minfreqid", freq);
+ return daPointDao.getCumulatePoint(params);
+ }
+
+ @Override
+ public List<DaPointDTO> getCumulatePoint(List<String> pointNos) {
+ Map<String, Object> params = new HashMap<>(3);
+ params.put("pointType", PointTypeEnum.CUMULATE.getCode());
+ params.put("isEnable", CommonConstant.IS_ENABLE);
+ params.put("pointNos", pointNos);
+ return daPointDao.getCumulatePoint(params);
+ }
+
+ @Override
+ public List<DaPointDTO> getCumulatePoint(DaPointPageReqVO reqVO) {
+ Map<String, Object> params = new HashMap<>(3);
+ params.put("pointType", PointTypeEnum.CUMULATE.getCode());
+ params.put("pointNo", reqVO.getPointNo());
+ params.put("pointName", reqVO.getPointName());
+ return daPointDao.getCumulatePoint(params);
+ }
+
+ @Override
public DaPointDTO getByNo(String pointNo) {
if (pointNoMap.containsKey(pointNo)) {
return pointNoMap.get(pointNo);
@@ -360,9 +396,12 @@
PointImportRespVO respVO = PointImportRespVO.builder().createPointnames(new ArrayList<>())
.updatePointnames(new ArrayList<>()).failurePointnames(new LinkedHashMap<>()).build();
importPoints.forEach(importPoint -> {
-
// 判断如果不存在，再进行插入
- DaPointEntity existPoint = baseMapper.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());
@@ -386,11 +425,19 @@
case CONSTANT:
daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_F.name()));
break;
+ case CUMULATE:
+ DaCumulatePointDTO cumulatePoint = new DaCumulatePointDTO();
+ cumulatePoint.setMomentPoint(importPoint.getMomentPoint());
+ cumulatePoint.setLength(importPoint.getLength());
+ cumulatePoint.setDivisor(importPoint.getDivisor());
+ daCumulatePointService.add(cumulatePoint, daPointEntity.getId());
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_L.name()));
default:
break;
}
daPointDao.insert(daPointEntity);
+ daPointCollectStatusService.add(daPointEntity.getPointNo());
respVO.getCreatePointnames().add(importPoint.getPointName());
return;
}
@@ -403,15 +450,22 @@
DaPointEntity updatePoint = BeanUtils.toBean(importPoint, DaPointEntity.class);
updatePoint.setId(existPoint.getId());
- baseMapper.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()));
+ baseDao.updateById(updatePoint);
+ 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