From ebe0da6f38d81b13ed69e9958d3b497668f58f38 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 09 四月 2025 17:12:41 +0800
Subject: [PATCH] 计算点，最小值限制
---
iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml | 5 +++++
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java | 6 ++++++
2 files changed, 11 insertions(+), 0 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 22b0cbd..6073712 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
@@ -67,6 +67,12 @@
Object rawValue = singleCompute(dto, dataMap, listGood, listBad);
BigDecimal coefficient = dto.getUnittransfactor() == null ? BigDecimal.ONE : dto.getUnittransfactor();
BigDecimal calValue = new BigDecimal(rawValue.toString()).multiply(coefficient);
+ if (dto.getMaxValue() != null && calValue.compareTo(dto.getMaxValue()) > 0) {
+ calValue = dto.getMaxValue();
+ } else if (dto.getMinValue() != null && calValue.compareTo(dto.getMinValue()) < 0) {
+ calValue = dto.getMinValue();
+ }
+
InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, calValue);
pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid())));
result.add(pojo);
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml b/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml
index 6a37163..96cfa3f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml
@@ -239,6 +239,8 @@
t1.point_name,
t1.default_value,
t1.unittransfactor,
+ t1.max_value,
+ t1.min_value,
t1.point_type,
t1.data_type,
t1.store_type,
@@ -271,6 +273,9 @@
t1.point_type,
t1.data_type,
t1.store_type,
+ t1.unittransfactor,
+ t1.max_value,
+ t1.min_value,
t1.minfreqid,
t2.moment_point,
t2.length,
--
Gitblit v1.9.3