From 48c064d5395ac6a56ba381913219e90f0e4bac8d Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 14 一月 2025 14:23:12 +0800
Subject: [PATCH] 根据计算点编号查询测点集合
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 a8d9f0c..aca9940 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
@@ -1,5 +1,6 @@
package com.iailab.module.data.api.point;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.data.api.point.dto.*;
@@ -7,8 +8,10 @@
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.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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -17,6 +20,7 @@
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
/**
* @author PanZhibao
@@ -35,6 +39,9 @@
@Autowired
private InfluxDBService influxDBService;
+
+ @Autowired
+ private DaMathPointService daMathPointService;
@Override
public ApiPointDTO getInfoById(String pointId) {
@@ -130,4 +137,24 @@
return false;
}
}
+
+ @Override
+ public PageResult<ApiPointDTO> getPageByNo(String pointNo) {
+ DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(pointNo);
+ 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;
+ }).collect(Collectors.toList());
+ return pageResult;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3