From 023d6b104c5056ced2fb0b834ae28363078203ba Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 24 二月 2025 16:14:45 +0800
Subject: [PATCH] 修改查询指标历史,计算指标无法查询到数据的问题

---
 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