From ad67e60bdc758f04b813f4a08b711504a5d0c996 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 30 四月 2025 11:28:49 +0800
Subject: [PATCH] 新增最近90天指标时间限定

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java |   58 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
index aca9940..17d4dec 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
@@ -8,13 +8,16 @@
 import com.iailab.module.data.influxdb.service.InfluxDBService;
 import com.iailab.module.data.influxdb.service.impl.InfluxDBServiceImpl;
 import com.iailab.module.data.point.collection.PointCollector;
+import com.iailab.module.data.point.collection.handler.CalculateHandle;
 import com.iailab.module.data.point.dto.DaMathPointDTO;
 import com.iailab.module.data.point.dto.DaPointDTO;
 import com.iailab.module.data.point.dto.DaPointWriteValueDTO;
 import com.iailab.module.data.point.service.DaMathPointService;
 import com.iailab.module.data.point.service.DaPointService;
+import com.iailab.module.data.point.vo.DaPointPageReqVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -68,6 +71,24 @@
     }
 
     @Override
+    public Map<String, Object> queryPointMaxValue(ApiPointValueQueryDTO queryDto) {
+        Map<String, Object> result = new HashMap<>();
+        if (StringUtils.isEmpty(queryDto.getPointNo())) {
+            return null;
+        }
+        if (queryDto.getStart() == null) {
+            return null;
+        }
+        DaPointDTO daPointDTO = daPointService.getByNo(queryDto.getPointNo());
+        InfluxPointValuePOJO pojo = new InfluxPointValuePOJO();
+        pojo.setPoint(queryDto.getPointNo());
+        pojo.setType(daPointDTO.getDataType());
+        Object val = influxDBService.queryPointMaxValue(pojo, queryDto.getStart());
+        result.put(queryDto.getPointNo(), val);
+        return result;
+    }
+
+    @Override
     public Map<String, List<Map<String, Object>>> queryPointsHistoryValue(ApiPointsValueQueryDTO queryDto) {
         Map<String, List<Map<String, Object>>> data = new HashMap<>();
         Calendar calendar = Calendar.getInstance();
@@ -110,6 +131,7 @@
             endTime = calendar.getTime();
         }
         if (startTime == null) {
+            calendar.setTime(endTime);
             calendar.add(Calendar.HOUR_OF_DAY, -1);
             startTime = calendar.getTime();
         }
@@ -139,22 +161,28 @@
     }
 
     @Override
-    public PageResult<ApiPointDTO> getPageByNo(String pointNo) {
-        DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(pointNo);
+    public PageResult<ApiPointDTO> queryMathPointCurrentValue(ApiPointPageReqVO reqVO) {
+        DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(reqVO.getPointNo());
         DaMathPointDTO daMathPointDTO = daMathPointService.getByPoint(daPointDTO.getId());
-        String[] pointNos = daMathPointDTO.getExpression().split("[-+]+");
-        HashMap<Integer, String> map = new HashMap<>();
-        IntStream.range(0, pointNos.length).forEach(i -> map.put(i, pointNos[i]));
-        List<String> pointNosL = new ArrayList<>();
-        for (String value : map.values()) {
-            pointNosL.add(value);
-        }
-        PageResult<ApiPointDTO> pageResult = daPointService.getPointPage(map);
-        Map<String, Object> CurrentValueMap = pointCollector.getCurrentValue(pointNosL);
-        pageResult.getList().stream().map(item -> {
-            item.setCurrentValue(CurrentValueMap.get(item.getPointNo()));
-            return item;
+        String[] pointNos = daMathPointDTO.getExpression().split(CalculateHandle.regex);
+        DaPointPageReqVO pageReqVO = new DaPointPageReqVO();
+        pageReqVO.setPageNo(reqVO.getPageNo());
+        pageReqVO.setPageSize(reqVO.getPageSize());
+        pageReqVO.setPointNos(Arrays.asList(pointNos));
+        PageResult<DaPointDTO> pageResult = daPointService.queryPage(pageReqVO);
+        List<String> pointNosL = pageResult.getList().stream().map(item -> {
+            return item.getPointNo();
         }).collect(Collectors.toList());
-        return pageResult;
+        Map<String, Object> currentValueMap = pointCollector.getCurrentValue(pointNosL);
+
+        List<ApiPointDTO> dataList = new ArrayList<>();
+        pageResult.getList().forEach(item -> {
+            ApiPointDTO dto = new ApiPointDTO();
+            dto.setPointNo(item.getPointNo());
+            dto.setPointName(item.getPointName());
+            dto.setCurrentValue(currentValueMap.get(item.getPointNo()).toString());
+            dataList.add(dto);
+        });
+        return new PageResult<>(dataList, pageResult.getTotal());
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3