From 85988421613383c029a25f1e21dfe8dd09cc562c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 15:29:14 +0800
Subject: [PATCH] queryMathPointCurrentValue

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/impl/DaPointServiceImpl.java |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 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 2374f2f..beada3c 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;
@@ -64,7 +67,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 +115,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 +188,7 @@
         daPointEntity.setCreateTime(new Date());
         daPointDao.insert(daPointEntity);
 
+        daPointCollectStatusService.add(daPointEntity.getPointNo());
         // 清空缓存
         clearCache();
     }
@@ -328,6 +335,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());
@@ -381,7 +397,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());
@@ -417,6 +433,7 @@
                 }
 
                 daPointDao.insert(daPointEntity);
+                daPointCollectStatusService.add(daPointEntity.getPointNo());
                 respVO.getCreatePointnames().add(importPoint.getPointName());
                 return;
             }
@@ -429,7 +446,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