From cb5066ddca3d7c8d0959b20715f0f46948e6753e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 14:40:42 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 00380e0..cf84ff1 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;
@@ -44,7 +47,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;
@@ -67,7 +70,7 @@
@Resource
private DaPointCollectStatusService daPointCollectStatusService;
- private static Map<String, DaPointDTO> pointIdMap = new ConcurrentHashMap<>();
+ private static Map<String, ApiPointDTO> pointIdMap = new ConcurrentHashMap<>();
private static Map<String, DaPointDTO> pointNoMap = new ConcurrentHashMap<>();
@@ -112,16 +115,16 @@
}
@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
@@ -305,6 +308,12 @@
}
@Override
+ public PageResult<ApiPointDTO> getPointPage(HashMap map) {
+ IPage<ApiPointDTO> page = daPointDao.getPointPage(getPage(map, Constant.CREATE_TIME, false),map);
+ return new PageResult<>(page.getRecords(), page.getTotal());
+ }
+
+ @Override
public List<DaPointDTO> getMathPoint(String freq) {
Map<String, Object> params = new HashMap<>();
params.put("pointType", PointTypeEnum.CALCULATE_POINT.getCode());
@@ -328,6 +337,15 @@
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);
}
@@ -385,7 +403,7 @@
importPoints.forEach(importPoint -> {
// 判断如果不存在，再进行插入
- DaPointEntity existPoint = baseMapper.selectByPointName(importPoint.getPointName());
+ DaPointEntity existPoint = baseDao.selectByPointName(importPoint.getPointName());
if (existPoint == null) {
DaPointEntity daPointEntity = ConvertUtils.sourceToTarget(importPoint, DaPointEntity.class);
daPointEntity.setId(UUID.randomUUID().toString());
@@ -421,6 +439,7 @@
}
daPointDao.insert(daPointEntity);
+ daPointCollectStatusService.add(daPointEntity.getPointNo());
respVO.getCreatePointnames().add(importPoint.getPointName());
return;
}
@@ -433,7 +452,7 @@
DaPointEntity updatePoint = BeanUtils.toBean(importPoint, DaPointEntity.class);
updatePoint.setId(existPoint.getId());
- baseMapper.updateById(updatePoint);
+ baseDao.updateById(updatePoint);
DaMeasurePointEntity measurePoint = new DaMeasurePointEntity();
measurePoint.setSourceType(importPoint.getSourceType());
measurePoint.setSourceId(sourcesIdMap.get(importPoint.getSourceType()).get(importPoint.getSourceName()));
--
Gitblit v1.9.3