From 4be7d863a161b64f8592a789d699e807545e7dc6 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期五, 15 十一月 2024 16:46:12 +0800 Subject: [PATCH] 计划数据 --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 21 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 ac053f1..58ac5ec 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,23 +1,18 @@ 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.DaMeasurePointDTO; @@ -28,21 +23,20 @@ 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.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.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 @@ -65,15 +59,21 @@ private DaPointDao daPointDao; @Resource - private ConfigApi configApi; - - @Resource 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 @@ -96,7 +96,12 @@ @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); + pointIdMap.put(id, dto); + return dto; } @Override @@ -155,6 +160,9 @@ daPointEntity.setIsEnable(CommonConstant.IS_ENABLE); daPointEntity.setCreateTime(new Date()); daPointDao.insert(daPointEntity); + + // 清空缓存 + clearCache(); } @Override @@ -177,6 +185,8 @@ default: break; } + // 清空缓存 + clearCache(); } @Override @@ -185,6 +195,8 @@ daPointDao.deleteBatchIds(Arrays.asList(id)); daMeasurePointService.deleteByPoint(id); daMathPointService.deleteByPoint(id); + // 清空缓存 + clearCache(); } @Override @@ -283,10 +295,15 @@ @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 @@ -389,7 +406,7 @@ Arrays.asList(ids).forEach(item -> { DaPointEntity entity = new DaPointEntity(); entity.setId(item); - entity.setIsEnable(IsEnableEnum.ENABLE.value()); + entity.setIsEnable(IsEnableEnum.ENABLE.getCode()); daPointDao.updateById(entity); }); } @@ -402,7 +419,7 @@ Arrays.asList(ids).forEach(item -> { DaPointEntity entity = new DaPointEntity(); entity.setId(item); - entity.setIsEnable(IsEnableEnum.DISABLE.value()); + entity.setIsEnable(IsEnableEnum.DISABLE.getCode()); daPointDao.updateById(entity); }); } -- Gitblit v1.9.3