From 9328cef33d3df819dd12b4c73e37163c8d3151ba Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 18:54:48 +0800
Subject: [PATCH] 时序数据存档加入定时任务过滤白名单
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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..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,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;
@@ -16,6 +17,7 @@
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;
@@ -69,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();
@@ -111,6 +131,7 @@
endTime = calendar.getTime();
}
if (startTime == null) {
+ calendar.setTime(endTime);
calendar.add(Calendar.HOUR_OF_DAY, -1);
startTime = calendar.getTime();
}
@@ -143,7 +164,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