From 1b9a04922fbcfbc85bde04e6d23955f0ba6283b5 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期六, 18 一月 2025 14:25:49 +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/CalculateHandle.java | 4 ++++
1 files changed, 4 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 c5ac688..4dd5838 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;
/**
* 计算点处理
@@ -83,6 +85,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");
--
Gitblit v1.9.3