From cd069965f32189683598ac1096dab66c992c517b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 14 三月 2025 16:36:10 +0800
Subject: [PATCH] BAD点值修复
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
index 4dd5838..8b1376a 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
@@ -13,6 +13,7 @@
import com.iailab.module.data.influxdb.pojo.InfluxPointValuePOJO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +23,6 @@
import java.math.BigDecimal;
import java.util.*;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
@@ -53,7 +53,7 @@
public static final String regex = "[+\\-\\*/()\\&\\|\\>\\<]";
- public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap,List<String> listGood,List<String> listBad) {
+ public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap, List<String> listGood, List<String> listBad) {
List<InfluxPointValuePOJO> result = new ArrayList<>();
try {
log.info("计算点处理开始");
@@ -63,8 +63,10 @@
log.info(JSON.toJSONString(listBad));
dtos.forEach(dto -> {
try {
- Object value = singleCompute(dto, dataMap, listGood, listBad);
- InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
+ Object rawValue = singleCompute(dto, dataMap, listGood, listBad);
+ BigDecimal coefficient = dto.getUnittransfactor() == null ? BigDecimal.ONE : dto.getUnittransfactor();
+ BigDecimal calValue = new BigDecimal(rawValue.toString()).multiply(coefficient);
+ InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, calValue);
pojo.setTimestamp(collectTime.toInstant());
result.add(pojo);
} catch (Exception ex) {
@@ -81,7 +83,7 @@
return result;
}
- private Object singleCompute(DaPointDTO dto, Map<String, Object> dataMap,List<String> listGood,List<String> listBad) {
+ private Object singleCompute(DaPointDTO dto, Map<String, Object> dataMap, List<String> listGood, List<String> listBad) {
String expression = dto.getExpression();
log.info("PointNo=" + dto.getPointNo() + ";SourceExpression=" + expression);
String[] arr = expression.split(regex);
@@ -139,7 +141,9 @@
if (redisTemplate.hasKey(PointCollector.PV + item.getPointNo())) {
value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
} else {
- value = singleCompute(item);
+ Object rawValue = singleCompute(item);
+ BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor();
+ value = new BigDecimal(rawValue.toString()).multiply(coefficient);
}
data.put(item.getPointNo(), value);
});
@@ -162,10 +166,10 @@
dataMap.putAll(constantHandle.getCurrent(pointNos));
if (dataMap.get(s) == null) {
log.info("计算点数据异常");
- log.info("pointNo=" + dto.getPointNo() +";dataMap.key=" + s);
+ log.info("pointNo=" + dto.getPointNo() + ";dataMap.key=" + s);
return CommonConstant.BAD_VALUE;
}
- String valueStr = dataMap.get(s).toString();
+ String valueStr = dataMap.get(s).toString();
if (StrUtils.isNumeric(valueStr) && new BigDecimal(valueStr).compareTo(CommonConstant.BAD_VALUE) == 0) {
log.info("BAD_VALUE:" + s);
}
--
Gitblit v1.9.3