From 023d6b104c5056ced2fb0b834ae28363078203ba Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 24 二月 2025 16:14:45 +0800
Subject: [PATCH] 修改查询指标历史，计算指标无法查询到数据的问题
---
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 c57f176..2e29855 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;
@@ -111,6 +112,7 @@
endTime = calendar.getTime();
}
if (startTime == null) {
+ calendar.setTime(endTime);
calendar.add(Calendar.HOUR_OF_DAY, -1);
startTime = calendar.getTime();
}
@@ -143,7 +145,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());
--
Gitblit v1.9.3