From aa7983f90ec83bc50afee1f95d89f496bb92e525 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 六月 2025 10:12:21 +0800
Subject: [PATCH] 测点当前值增加上下限制
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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..9d5a09e 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
@@ -5,8 +5,6 @@
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
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;
@@ -14,8 +12,8 @@
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;
import com.iailab.module.data.common.enums.IncreaseCodeEnum;
+import com.iailab.module.data.common.enums.IsEnableEnum;
import com.iailab.module.data.point.common.PointTypeEnum;
import com.iailab.module.data.point.dao.DaPointDao;
import com.iailab.module.data.point.dto.DaCumulatePointDTO;
@@ -25,6 +23,7 @@
import com.iailab.module.data.point.entity.DaMeasurePointEntity;
import com.iailab.module.data.point.entity.DaPointEntity;
import com.iailab.module.data.point.service.*;
+import com.iailab.module.data.point.vo.DaPointCountReqVO;
import com.iailab.module.data.point.vo.DaPointPageReqVO;
import com.iailab.module.data.point.vo.PointImportExcelVO;
import com.iailab.module.data.point.vo.PointImportRespVO;
@@ -323,6 +322,16 @@
}
@Override
+ public Long getPointCount(DaPointCountReqVO reqVO ) {
+ if (StringUtils.isNotBlank(reqVO.getCollectQuality())){
+ return daPointDao.getPointCount(reqVO);
+ }
+ QueryWrapper<DaPointEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(reqVO.getIsEnable() != null, "is_enable", reqVO.getIsEnable());
+ return daPointDao.selectCount(queryWrapper);
+ }
+
+ @Override
public List<DaPointDTO> getMathPoint(String freq) {
Map<String, Object> params = new HashMap<>();
params.put("pointType", PointTypeEnum.CALCULATE_POINT.getCode());
@@ -427,7 +436,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 +448,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 +474,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 +484,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 +503,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 +510,7 @@
break;
}
respVO.getUpdatePointnames().add(importPoint.getPointName());
- });
+ }
return respVO;
}
--
Gitblit v1.9.3