From a82313d17b2b5d1c02e880122efc1b701c401dcf Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 04 十二月 2024 09:58:58 +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 | 280 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 206 insertions(+), 74 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 fee2663..2374f2f 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
@@ -1,47 +1,42 @@
package com.iailab.module.data.point.service.impl;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
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.google.common.annotations.VisibleForTesting;
-import com.iailab.framework.common.exception.ServiceException;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.framework.datapermission.core.util.DataPermissionUtils;
-import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
+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.point.common.IncreaseCodeEnum;
+import com.iailab.module.data.common.enums.IncreaseCodeEnum;
import com.iailab.module.data.point.common.PointTypeEnum;
import com.iailab.module.data.point.dao.DaPointDao;
+import com.iailab.module.data.point.dto.DaCumulatePointDTO;
+import com.iailab.module.data.point.dto.DaMathPointDTO;
import com.iailab.module.data.point.dto.DaMeasurePointDTO;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.entity.DaMeasurePointEntity;
import com.iailab.module.data.point.entity.DaPointEntity;
-import com.iailab.module.data.point.service.DaMathPointService;
-import com.iailab.module.data.point.service.DaMeasurePointService;
-import com.iailab.module.data.point.service.DaPointService;
-import com.iailab.module.data.point.service.DaSequenceNumService;
-import com.iailab.module.data.point.vo.*;
-import com.iailab.module.infra.api.config.ConfigApi;
+import com.iailab.module.data.point.service.*;
+import com.iailab.module.data.point.vo.DaPointPageReqVO;
+import com.iailab.module.data.point.vo.PointImportExcelVO;
+import com.iailab.module.data.point.vo.PointImportRespVO;
import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-
import javax.annotation.Resource;
import java.util.*;
-
-import com.iailab.module.data.enums.ErrorCodeConstants;
+import java.util.concurrent.ConcurrentHashMap;
import static com.iailab.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.iailab.module.data.enums.ErrorCodeConstants.*;
+import static com.iailab.module.data.enums.ErrorCodeConstants.POINT_EXISTS;
+import static com.iailab.module.data.enums.ErrorCodeConstants.POINT_IMPORT_LIST_IS_EMPTY;
/**
* @author lirm
@@ -51,48 +46,79 @@
@Service
public class DaPointServiceImpl extends ServiceImpl<DaPointDao, DaPointEntity> implements DaPointService {
- @Resource
+ @Autowired
private DaMeasurePointService daMeasurePointService;
- @Resource
+ @Autowired
private DaMathPointService daMathPointService;
- @Resource
+ @Autowired
+ private DaCumulatePointService daCumulatePointService;
+
+ @Autowired
private DaSequenceNumService daSequenceNumService;
@Resource
private DaPointDao daPointDao;
@Resource
- private ConfigApi configApi;
+ private ChannelSourceService channelSourceService;
+
+ private static Map<String, DaPointDTO> pointIdMap = new ConcurrentHashMap<>();
+
+ private static Map<String, DaPointDTO> pointNoMap = new ConcurrentHashMap<>();
@Override
public PageResult<DaPointDTO> queryPage(DaPointPageReqVO reqVO) {
IPage<DaPointDTO> page = daPointDao.selectPageList(reqVO);
- return new PageResult<DaPointDTO>(page.getRecords(), page.getTotal());
+ return new PageResult<>(page.getRecords(), page.getTotal());
+ }
+
+ private void clearCache() {
+ pointIdMap.clear();
+ pointNoMap.clear();
}
@Override
public DaPointDTO info(String id) {
DaPointEntity entity = daPointDao.selectById(id);
DaPointDTO result = ConvertUtils.sourceToTarget(entity, DaPointDTO.class);
- if (PointTypeEnum.MEASURE_POINT.getCode().equals(result.getPointType())) {
- DaMeasurePointDTO measurePoint = daMeasurePointService.getByPoint(id);
- result.setMeasurePoint(measurePoint);
- List<String> sourceOption = new ArrayList<>();
- sourceOption.add(measurePoint.getSourceType());
- sourceOption.add(measurePoint.getSourceId());
- sourceOption.add(measurePoint.getTagNo());
- result.setSourceOption(sourceOption);
- } else if (PointTypeEnum.CALCULATE_POINT.getCode().equals(result.getPointType())) {
- result.setMathPoint(daMathPointService.getByPoint(id));
+ result.setMeasurePoint(new DaMeasurePointDTO());
+ result.setMathPoint(new DaMathPointDTO());
+ result.setCumulatePoint(new DaCumulatePointDTO());
+ switch (PointTypeEnum.getEumByCode(result.getPointType())) {
+ case MEASURE_POINT:
+ DaMeasurePointDTO measurePoint = daMeasurePointService.getByPoint(id);
+ result.setMeasurePoint(measurePoint);
+ List<String> sourceOption = new ArrayList<>();
+ sourceOption.add(measurePoint.getSourceType());
+ sourceOption.add(measurePoint.getSourceId());
+ sourceOption.add(measurePoint.getTagNo());
+ result.setSourceOption(sourceOption);
+ break;
+ case CALCULATE_POINT:
+ result.setMathPoint(daMathPointService.getByPoint(id));
+ break;
+ case CUMULATE:
+ result.setCumulatePoint(daCumulatePointService.getByPoint(id));
+ break;
+ default:
+ break;
}
return result;
}
@Override
public DaPointDTO getSimpleInfoById(String id) {
- return ConvertUtils.sourceToTarget(daPointDao.selectById(id), DaPointDTO.class);
+ if (pointIdMap.containsKey(id)) {
+ return pointIdMap.get(id);
+ }
+ DaPointDTO dto = ConvertUtils.sourceToTarget(daPointDao.selectById(id), DaPointDTO.class);
+ if (dto == null) {
+ return null;
+ }
+ pointIdMap.put(id, dto);
+ return pointIdMap.get(id);
}
@Override
@@ -109,11 +135,17 @@
if (params.get("pointNos") != null) {
pointNos = JSONArray.parseArray(JSONArray.toJSONString(params.get("pointNos")), String.class);
}
+ List<String> pointTypes = new ArrayList<>();
+ if (params.get("pointTypes") != null) {
+ pointTypes = Arrays.asList(params.get("pointTypes").toString().split(","));
+ }
+
Object pointNoLike = params.get("pointNoLike");
QueryWrapper<DaPointEntity> queryWrapper = new QueryWrapper();
queryWrapper.eq(!ObjectUtils.isEmpty(pointType), "point_type", pointType);
queryWrapper.in(pointNos.size() != 0,"point_no", pointNos);
queryWrapper.like(!ObjectUtils.isEmpty(pointNoLike), "point_no", pointNoLike);
+ queryWrapper.in(pointTypes.size() != 0,"point_type", pointTypes);
List<DaPointEntity> list = daPointDao.selectList(queryWrapper);
return ConvertUtils.sourceToTarget(list, DaPointDTO.class);
}
@@ -123,22 +155,35 @@
public void add(DaPointDTO dataPoint) {
DaPointEntity daPointEntity = ConvertUtils.sourceToTarget(dataPoint, DaPointEntity.class);
daPointEntity.setId(UUID.randomUUID().toString());
- if (PointTypeEnum.MEASURE_POINT.getName().equals(dataPoint.getPointType())) {
- DaMeasurePointDTO measurePoint = new DaMeasurePointDTO();
- measurePoint.setSourceType(dataPoint.getSourceOption().get(0));
- measurePoint.setSourceId(dataPoint.getSourceOption().get(1));
- measurePoint.setTagNo(dataPoint.getSourceOption().get(2));
- daMeasurePointService.add(measurePoint, daPointEntity.getId());
- daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_M.name()));
- } else if (PointTypeEnum.CALCULATE_POINT.getName().equals(dataPoint.getPointType())) {
- daMathPointService.add(dataPoint.getMathPoint(), daPointEntity.getId());
- daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_C.name()));
- } else if (PointTypeEnum.CONSTANT.getName().equals(dataPoint.getPointType())) {
- daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_F.name()));
+ switch (PointTypeEnum.getEumByCode(dataPoint.getPointType())) {
+ case MEASURE_POINT:
+ DaMeasurePointDTO measurePoint = new DaMeasurePointDTO();
+ measurePoint.setSourceType(dataPoint.getSourceOption().get(0));
+ measurePoint.setSourceId(dataPoint.getSourceOption().get(1));
+ measurePoint.setTagNo(dataPoint.getSourceOption().get(2));
+ daMeasurePointService.add(measurePoint, daPointEntity.getId());
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_M.name()));
+ break;
+ case CALCULATE_POINT:
+ daMathPointService.add(dataPoint.getMathPoint(), daPointEntity.getId());
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_C.name()));
+ break;
+ case CONSTANT:
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_F.name()));
+ break;
+ case CUMULATE:
+ daCumulatePointService.add(dataPoint.getCumulatePoint(), daPointEntity.getId());
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_L.name()));
+ break;
+ default:
+ break;
}
daPointEntity.setIsEnable(CommonConstant.IS_ENABLE);
daPointEntity.setCreateTime(new Date());
daPointDao.insert(daPointEntity);
+
+ // 清空缓存
+ clearCache();
}
@Override
@@ -147,23 +192,45 @@
DaPointEntity daPointEntity = ConvertUtils.sourceToTarget(dataPoint, DaPointEntity.class);
daPointEntity.setUpdateTime(new Date());
daPointDao.updateById(daPointEntity);
- if (PointTypeEnum.MEASURE_POINT.getName().equals(dataPoint.getPointType())) {
- DaMeasurePointDTO measurePoint = dataPoint.getMeasurePoint();
- measurePoint.setSourceType(dataPoint.getSourceOption().get(0));
- measurePoint.setSourceId(dataPoint.getSourceOption().get(1));
- measurePoint.setTagNo(dataPoint.getSourceOption().get(2));
- daMeasurePointService.update(measurePoint);
- } else if (PointTypeEnum.CALCULATE_POINT.getName().equals(dataPoint.getPointType())) {
- daMathPointService.update(dataPoint.getMathPoint());
+ switch (PointTypeEnum.getEumByCode(dataPoint.getPointType())) {
+ case MEASURE_POINT:
+ DaMeasurePointDTO measurePoint = dataPoint.getMeasurePoint();
+ measurePoint.setSourceType(dataPoint.getSourceOption().get(0));
+ measurePoint.setSourceId(dataPoint.getSourceOption().get(1));
+ measurePoint.setTagNo(dataPoint.getSourceOption().get(2));
+ daMeasurePointService.update(measurePoint);
+ break;
+ case CALCULATE_POINT:
+ daMathPointService.update(dataPoint.getMathPoint());
+ break;
+ case CUMULATE:
+ daCumulatePointService.update(dataPoint.getCumulatePoint());
+ break;
+ default:
+ break;
}
+ // 清空缓存
+ clearCache();
}
@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();
+ }
+
+ @Override
+ public List<DaPointDTO> getConstantPoint(DaPointPageReqVO reqVO) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("pointType", PointTypeEnum.CONSTANT.getCode());
+ params.put("pointNo", reqVO.getPointNo());
+ params.put("pointName", reqVO.getPointName());
+ return daPointDao.getConstantPoint(params);
}
@Override
@@ -182,6 +249,16 @@
params.put("isEnable", CommonConstant.IS_ENABLE);
params.put("pointNos", pointNos);
return daPointDao.getConstantPoint(params);
+ }
+
+ @Override
+ public List<DaPointDTO> getMeasurePoint(DaPointPageReqVO reqVO) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("pointType", PointTypeEnum.MEASURE_POINT.getCode());
+ params.put("pointNo", reqVO.getPointNo());
+ params.put("pointName", reqVO.getPointName());
+ params.put("sourceName", reqVO.getSourceName());
+ return daPointDao.getMeasurePoint(params);
}
@Override
@@ -215,6 +292,15 @@
}
@Override
+ public List<DaPointDTO> getMathPoint(DaPointPageReqVO reqVO) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("pointType", PointTypeEnum.CALCULATE_POINT.getCode());
+ params.put("pointNo", reqVO.getPointNo());
+ params.put("pointName", reqVO.getPointName());
+ return daPointDao.getMathPoint(params);
+ }
+
+ @Override
public List<DaPointDTO> getMathPoint(String freq) {
Map<String, Object> params = new HashMap<>();
params.put("pointType", PointTypeEnum.CALCULATE_POINT.getCode());
@@ -233,11 +319,34 @@
}
@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(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);
+ }
QueryWrapper<DaPointEntity> wrapper = new QueryWrapper<>();
wrapper.eq("point_no", pointNo);
DaPointEntity entity = daPointDao.selectOne(wrapper);
- return ConvertUtils.sourceToTarget(entity, DaPointDTO.class);
+ DaPointDTO dto = ConvertUtils.sourceToTarget(entity, DaPointDTO.class);
+ pointNoMap.put(pointNo, dto);
+ return dto;
}
@Override
@@ -264,7 +373,8 @@
if (CollUtil.isEmpty(importPoints)) {
throw exception(POINT_IMPORT_LIST_IS_EMPTY);
}
-
+
+ Map<String, Map<String, String>> sourcesIdMap = channelSourceService.getSourcesId();
// 2. 遍历，逐个创建 or 更新
PointImportRespVO respVO = PointImportRespVO.builder().createPointnames(new ArrayList<>())
.updatePointnames(new ArrayList<>()).failurePointnames(new LinkedHashMap<>()).build();
@@ -273,20 +383,40 @@
// 判断如果不存在，再进行插入
DaPointEntity existPoint = baseMapper.selectByPointName(importPoint.getPointName());
if (existPoint == null) {
-
DaPointEntity daPointEntity = ConvertUtils.sourceToTarget(importPoint, DaPointEntity.class);
daPointEntity.setId(UUID.randomUUID().toString());
- DaMeasurePointDTO measurePoint = new DaMeasurePointDTO();
- measurePoint.setSourceType(importPoint.getSourceType());
- measurePoint.setSourceId(importPoint.getSourceId());
- measurePoint.setTagNo(importPoint.getTagNo());
- daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_M.name()));
daPointEntity.setIsEnable(CommonConstant.IS_ENABLE);
daPointEntity.setCreateTime(new Date());
+ switch (PointTypeEnum.getEumByCode(daPointEntity.getPointType())) {
+ case MEASURE_POINT:
+ DaMeasurePointDTO measurePoint = new DaMeasurePointDTO();
+ measurePoint.setSourceType(importPoint.getSourceType());
+ measurePoint.setSourceId(sourcesIdMap.get(importPoint.getSourceType()).get(importPoint.getSourceName()));
+ measurePoint.setTagNo(importPoint.getTagNo());
+ measurePoint.setValueType(importPoint.getValueType());
+ measurePoint.setDimension(importPoint.getDimension());
+ daMeasurePointService.add(measurePoint, daPointEntity.getId());
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_M.name()));
+ break;
+ case CALCULATE_POINT:
+ daMathPointService.add(importPoint.getExpression(), daPointEntity.getId());
+ daPointEntity.setPointNo(daSequenceNumService.getAndIncreaseByCode(IncreaseCodeEnum.POINT_C.name()));
+ break;
+ 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;
+ }
- daMeasurePointService.add(measurePoint, daPointEntity.getId());
daPointDao.insert(daPointEntity);
-
respVO.getCreatePointnames().add(importPoint.getPointName());
return;
}
@@ -302,7 +432,7 @@
baseMapper.updateById(updatePoint);
DaMeasurePointEntity measurePoint = new DaMeasurePointEntity();
measurePoint.setSourceType(importPoint.getSourceType());
- measurePoint.setSourceId(importPoint.getSourceId());
+ measurePoint.setSourceId(sourcesIdMap.get(importPoint.getSourceType()).get(importPoint.getSourceName()));
measurePoint.setTagNo(importPoint.getTagNo());
daMeasurePointService.update(measurePoint, new QueryWrapper<DaMeasurePointEntity>().eq("point_id",updatePoint.getId()));
respVO.getUpdatePointnames().add(importPoint.getPointName());
@@ -311,13 +441,12 @@
}
@Override
- public PageResult<DaPointEntity> queryExcelList(DaPointPageReqVO exportReqVO) {
-
- return daPointDao.selectExcelList(exportReqVO);
-
+ public List<DaPointDTO> getList(DaPointPageReqVO exportReqVO) {
+ return daPointDao.getList(exportReqVO);
}
@Override
+ @DSTransactional(rollbackFor = Exception.class)
public void enableByIds(String[] ids) {
if (CollectionUtils.isEmpty(Arrays.asList(ids))) {
return;
@@ -325,12 +454,14 @@
Arrays.asList(ids).forEach(item -> {
DaPointEntity entity = new DaPointEntity();
entity.setId(item);
- entity.setIsEnable(IsEnableEnum.ENABLE.value());
+ entity.setIsEnable(IsEnableEnum.ENABLE.getCode());
+ entity.setUpdateTime(new Date());
daPointDao.updateById(entity);
});
}
@Override
+ @DSTransactional(rollbackFor = Exception.class)
public void disableByIds(String[] ids) {
if (CollectionUtils.isEmpty(Arrays.asList(ids))) {
return;
@@ -338,7 +469,8 @@
Arrays.asList(ids).forEach(item -> {
DaPointEntity entity = new DaPointEntity();
entity.setId(item);
- entity.setIsEnable(IsEnableEnum.DISABLE.value());
+ entity.setIsEnable(IsEnableEnum.DISABLE.getCode());
+ entity.setUpdateTime(new Date());
daPointDao.updateById(entity);
});
}
--
Gitblit v1.9.3