From 318cc2a652857631ede3d5752281ac66c9d0808c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 15:59:08 +0800
Subject: [PATCH] queryMathPointCurrentValue
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 ec00fd4..9141100 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,6 +8,7 @@
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;
@@ -143,7 +144,7 @@
public PageResult<ApiPointDTO> queryMathPointCurrentValue(ApiPointPageReqVO reqVO) {
DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(reqVO.getPointNo());
DaMathPointDTO daMathPointDTO = daMathPointService.getByPoint(daPointDTO.getId());
- String[] pointNos = daMathPointDTO.getExpression().split("[-+]+");
+ String[] pointNos = daMathPointDTO.getExpression().split(CalculateHandle.regex);
DaPointPageReqVO pageReqVO = new DaPointPageReqVO();
pageReqVO.setPageNo(reqVO.getPageNo());
pageReqVO.setPageSize(reqVO.getPageSize());
@@ -160,6 +161,7 @@
dto.setPointNo(item.getPointNo());
dto.setPointName(item.getPointName());
dto.setCurrentValue(currentValueMap.get(item.getPointNo()).toString());
+ dataList.add(dto);
});
return new PageResult<>(dataList, pageResult.getTotal());
}
--
Gitblit v1.9.3