From cb5066ddca3d7c8d0959b20715f0f46948e6753e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 14:40:42 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 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 46d4b47..05e28d2 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
@@ -7,14 +7,18 @@
import com.iailab.module.data.common.enums.CommonConstant;
import com.iailab.module.data.enums.DataPointFreqEnum;
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.dto.DaPointDTO;
+import com.iailab.module.data.point.service.DaPointService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
@@ -29,11 +33,17 @@
@Component
public class CumulateHandle {
+ @Resource
+ private DaPointService daPointService;
+
@Autowired
@Lazy
private DataPointApi dataPointApi;
- public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos) {
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos,List<String> listGood,List<String> listBad) {
List<InfluxPointValuePOJO> result = new ArrayList<>();
try {
log.info("累计点处理开始");
@@ -42,7 +52,7 @@
}
dtos.forEach(dto -> {
try {
- Object value = singleCompute(dto, collectTime);
+ Object value = singleCompute(dto, collectTime,listGood,listBad);
InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
pojo.setTimestamp(collectTime.toInstant());
result.add(pojo);
@@ -59,10 +69,36 @@
return result;
}
+ public Map<String, Object> getCurrent(List<String> pointNos) {
+ Map<String, Object> data = new HashMap<>();
+ List<DaPointDTO> pointMathList = daPointService.getCumulatePoint(pointNos);
+ if (CollectionUtils.isEmpty(pointMathList)) {
+ return data;
+ }
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ pointMathList.forEach(item -> {
+ Object value = CommonConstant.BAD_VALUE;
+ if (redisTemplate.hasKey(PointCollector.PV + item.getPointNo())) {
+ value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
+ } else {
+ value = singleCompute(item, calendar.getTime());
+ }
+ data.put(item.getPointNo(), value);
+ });
+ return data;
+ }
private Object singleCompute(DaPointDTO dto, Date collectTime) {
+ return singleCompute(dto,collectTime,null,null);
+ }
+
+ 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) {
+ listBad.add(dto.getPointNo());
+ }
return CommonConstant.BAD_VALUE;
}
Calendar calendar = Calendar.getInstance();
@@ -78,12 +114,18 @@
List<ApiPointValueDTO> dataList = dataPointApi.queryPointHistoryValue(queryDto);
if (CollectionUtils.isEmpty(dataList)) {
+ if (listGood != null) {
+ listGood.add(dto.getPointNo());
+ }
return BigDecimal.ZERO;
} else if (dataList.size() < dto.getLength()) {
// 补全数据
dataList = completionData(dto.getLength(), dataList, startTime, endTime, pointDTO);
}
double total = dataList.stream().mapToDouble(ApiPointValueDTO::getV).sum();
+ if (listGood != null) {
+ listGood.add(dto.getPointNo());
+ }
return new BigDecimal(total).divide(new BigDecimal(dto.getDivisor()), 2, BigDecimal.ROUND_HALF_UP);
}
@@ -139,6 +181,6 @@
return item.getValue();
}
}
- return null;
+ return 0.0;
}
}
\ No newline at end of file
--
Gitblit v1.9.3