From 77894e68af1bffbcc73150dc56f969fda0b31d7e Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 07 四月 2025 13:40:42 +0800
Subject: [PATCH] 累计测点 添加累计单位
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
index c6fb0f2..932746a 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
@@ -9,6 +9,7 @@
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
import com.iailab.module.data.point.collection.PointCollector;
import com.iailab.module.data.point.collection.utils.GenInfluxPointValueUtils;
+import com.iailab.module.data.point.common.PointCumulateUnitEnum;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointService;
import lombok.extern.slf4j.Slf4j;
@@ -101,12 +102,15 @@
}
return CommonConstant.BAD_VALUE;
}
+
+ // 动态长度
Calendar calendar = Calendar.getInstance();
calendar.setTime(collectTime);
- calendar.add(Calendar.MINUTE, -1);
+ calendar.add(Calendar.SECOND, -1 * DataPointFreqEnum.getEumByCode(dto.getMinfreqid()).getValue());
Date endTime = calendar.getTime();
- calendar.add(Calendar.MINUTE, dto.getLength() * -1);
- Date startTime = calendar.getTime();
+ Date startTime = PointCumulateUnitEnum.getStartTime(calendar,dto.getLength(),dto.getCumulateUnit());
+
+
ApiPointValueQueryDTO queryDto = new ApiPointValueQueryDTO();
queryDto.setStart(startTime);
queryDto.setEnd(endTime);
--
Gitblit v1.9.3