From 9495dbf27a7c46dceea46012c54c916a4663d98d Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期三, 04 六月 2025 11:11:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 09fc0f2..08a2ebb 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
@@ -1,6 +1,7 @@
package com.iailab.module.data.point.collection.handler;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.util.string.StrUtils;
import com.iailab.module.data.common.enums.CommonConstant;
import com.iailab.module.data.common.enums.DataTypeEnum;
@@ -161,20 +162,25 @@
// 去掉arr中的空格
arr = Stream.of(arr).filter(StringUtils::isNotBlank).toArray(String[]::new);
// 判断arr都在dataMap中包含
- if (!Arrays.stream(arr).allMatch(dataMap::containsKey)) {
+ /*if (!Arrays.stream(arr).allMatch(dataMap::containsKey)) {
log.info("dataMap not contains key");
listBad.add(dto.getPointNo());
return CommonConstant.BAD_VALUE;
- }
+ }*/
for (int i = 0; i < arr.length; i++) {
String s = arr[i];
if (StringUtils.isNotBlank(s) && dataMap.containsKey(s)) {
// 对每个数加（），否则负值报错
expression = expression.replace(s, "(" + dataMap.get(s).toString() + ")");
- } else if(StringUtils.isNotBlank(s) && s.contains(POINT_PREFIX)) {
+ } else if(StringUtils.isNotBlank(s) && s.trim().startsWith(POINT_PREFIX)) {
log.info("包含计算点，先挂起");
+ log.info("dataMap=" + JSONObject.toJSONString(dataMap));
return PENDING_FLAG;
+ } else if(StringUtils.isNotBlank(s) && !dataMap.containsKey(s)) {
+ log.info("dataMap not contains key " + s);
+ listBad.add(dto.getPointNo());
+ return CommonConstant.BAD_VALUE;
}
}
expression = expression.replace("&", "&&");
@@ -241,7 +247,7 @@
dataMap.putAll(constantHandle.getCurrent(pointNos));
dataMap.putAll(cumulateHandle.getCurrent(pointNos));
dataMap.putAll(extremalHandle.getCurrent(pointNos));
- if (s.contains(POINT_PREFIX)) {
+ if (s.trim().startsWith(POINT_PREFIX)) {
log.info("计算点递归查询");
List<DaPointDTO> pointMathList = daPointService.getMathPoint(pointNos);
if (CollectionUtils.isEmpty(pointMathList)) {
--
Gitblit v1.9.3