From f8bffb3ae6854fbcf6f78ed953bf73e33fadc8a9 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 28 四月 2025 14:52:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 17 +++++++++++++++++
1 files changed, 17 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 9141100..b194740 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
@@ -17,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;
@@ -70,6 +71,21 @@
}
@Override
+ public Object queryPointMaxValue(ApiPointValueQueryDTO queryDto) {
+ 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());
+ return influxDBService.queryPointMaxValue(pojo, queryDto.getStart());
+ }
+
+ @Override
public Map<String, List<Map<String, Object>>> queryPointsHistoryValue(ApiPointsValueQueryDTO queryDto) {
Map<String, List<Map<String, Object>>> data = new HashMap<>();
Calendar calendar = Calendar.getInstance();
@@ -112,6 +128,7 @@
endTime = calendar.getTime();
}
if (startTime == null) {
+ calendar.setTime(endTime);
calendar.add(Calendar.HOUR_OF_DAY, -1);
startTime = calendar.getTime();
}
--
Gitblit v1.9.3