From 59b61e7cd8c8c648da383971b5ad5b2691c11245 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 30 四月 2025 11:29:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 05e28d2..58625db 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
@@ -1,5 +1,6 @@
package com.iailab.module.data.point.collection.handler;
+import com.alibaba.fastjson.JSONObject;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
@@ -9,6 +10,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;
@@ -43,7 +45,7 @@
@Autowired
private RedisTemplate<String, Object> redisTemplate;
- public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos,List<String> listGood,List<String> listBad) {
+ public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, List<String> listGood, List<String> listBad) {
List<InfluxPointValuePOJO> result = new ArrayList<>();
try {
log.info("累计点处理开始");
@@ -52,9 +54,9 @@
}
dtos.forEach(dto -> {
try {
- Object value = singleCompute(dto, collectTime,listGood,listBad);
+ Object value = singleCompute(dto, collectTime, listGood, listBad);
InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
- pojo.setTimestamp(collectTime.toInstant());
+ pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid())));
result.add(pojo);
} catch (Exception ex) {
ex.printStackTrace();
@@ -77,6 +79,7 @@
}
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
pointMathList.forEach(item -> {
Object value = CommonConstant.BAD_VALUE;
if (redisTemplate.hasKey(PointCollector.PV + item.getPointNo())) {
@@ -90,10 +93,10 @@
}
private Object singleCompute(DaPointDTO dto, Date collectTime) {
- return singleCompute(dto,collectTime,null,null);
+ return singleCompute(dto, collectTime, null, null);
}
- private Object singleCompute(DaPointDTO dto, Date collectTime,List<String> listGood,List<String> listBad) {
+ private Object singleCompute(DaPointDTO dto, Date collectTime, List<String> listGood, List<String> listBad) {
ApiPointDTO pointDTO = dataPointApi.getInfoByNo(dto.getMomentPoint());
if (pointDTO == null) {
if (listBad != null) {
@@ -101,26 +104,31 @@
}
return CommonConstant.BAD_VALUE;
}
+ log.info("累计值:" + dto.getPointNo());
+
+ // 动态长度
+ ApiPointDTO momentPoint = dataPointApi.getInfoByNo(dto.getMomentPoint());
Calendar calendar = Calendar.getInstance();
calendar.setTime(collectTime);
- calendar.add(Calendar.MINUTE, -1);
+ calendar.add(Calendar.SECOND, -1 * DataPointFreqEnum.getEumByCode(momentPoint.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);
queryDto.setPointNo(dto.getMomentPoint());
-
+ log.info("queryDto=" + JSONObject.toJSONString(queryDto));
List<ApiPointValueDTO> dataList = dataPointApi.queryPointHistoryValue(queryDto);
if (CollectionUtils.isEmpty(dataList)) {
+ log.info("dataList is empty");
if (listGood != null) {
listGood.add(dto.getPointNo());
}
return BigDecimal.ZERO;
} else if (dataList.size() < dto.getLength()) {
- // 补全数据
- dataList = completionData(dto.getLength(), dataList, startTime, endTime, pointDTO);
+ log.info("补全数据，dataList.size()=" + dataList.size());
+ dataList = completionData(dto.getLength(), dataList, startTime, endTime, momentPoint.getMinfreqid());
}
double total = dataList.stream().mapToDouble(ApiPointValueDTO::getV).sum();
if (listGood != null) {
@@ -129,7 +137,7 @@
return new BigDecimal(total).divide(new BigDecimal(dto.getDivisor()), 2, BigDecimal.ROUND_HALF_UP);
}
- private List<ApiPointValueDTO> completionData(int length, List<ApiPointValueDTO> dataList, Date startTime, Date endTime, ApiPointDTO pointDTO) {
+ private List<ApiPointValueDTO> completionData(int length, List<ApiPointValueDTO> dataList, Date startTime, Date endTime, String minfreqid) {
if (CollectionUtils.isEmpty(dataList) || length == dataList.size()) {
return dataList;
} else if (length < dataList.size()) {
@@ -139,7 +147,7 @@
List<ApiPointValueDTO> result = new ArrayList<>();
long start = startTime.getTime();
long end = endTime.getTime();
- long oneMin = 1000L * DataPointFreqEnum.getEumByCode(pointDTO.getMinfreqid()).getValue();
+ long oneMin = 1000L * DataPointFreqEnum.getEumByCode(minfreqid).getValue();
long mins = (end - start) / oneMin;
//找出缺少项
--
Gitblit v1.9.3