From 37cb8688dc8e320a40b51c6d6128f64800706413 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 06 三月 2025 16:27:13 +0800
Subject: [PATCH] 增加授权sdk错误信息捕获
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 c5ac688..014e6cd 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
@@ -22,6 +22,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* 计算点处理
@@ -61,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) {
@@ -83,6 +87,8 @@
String expression = dto.getExpression();
log.info("PointNo=" + dto.getPointNo() + ";SourceExpression=" + expression);
String[] arr = expression.split(regex);
+ // 去掉arr中的空格
+ arr = Stream.of(arr).filter(StringUtils::isNotBlank).toArray(String[]::new);
// 判断arr都在dataMap中包含
if (!Arrays.stream(arr).allMatch(dataMap::containsKey)) {
log.info("dataMap not contains key");
@@ -135,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);
});
--
Gitblit v1.9.3