From d6464955dc20cb527f7be02ac8631c1effb1768a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:12:11 +0800
Subject: [PATCH] 计算点查询问题修复
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 2374f2f..b365cb9 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
@@ -9,6 +9,7 @@
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.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;
@@ -64,7 +65,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 +113,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 +186,7 @@
daPointEntity.setCreateTime(new Date());
daPointDao.insert(daPointEntity);
+ daPointCollectStatusService.add(daPointEntity.getPointNo());
// 清空缓存
clearCache();
}
@@ -328,6 +333,15 @@
}
@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());
@@ -417,6 +431,7 @@
}
daPointDao.insert(daPointEntity);
+ daPointCollectStatusService.add(daPointEntity.getPointNo());
respVO.getCreatePointnames().add(importPoint.getPointName());
return;
}
--
Gitblit v1.9.3