From dbd8a0de4b94f846a6beeccfaca3ed5cc08b0b9e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 28 二月 2025 13:33:57 +0800
Subject: [PATCH] 计算点增加单位转换
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.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/CalculateHandle.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
index 4dd5838..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
@@ -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) {
@@ -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);
});
--
Gitblit v1.9.3