From 6a8e248a786e4a3f5ec76d46e21057f8fd84300a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期六, 18 一月 2025 13:41:45 +0800
Subject: [PATCH] singleCompute 修改
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 20 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 5fe035d..c5ac688 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,8 +1,12 @@
package com.iailab.module.data.point.collection.handler;
+import com.alibaba.fastjson.JSON;
+import com.iailab.framework.common.util.string.StrUtils;
+import com.iailab.module.data.common.enums.CommonConstant;
import com.iailab.module.data.common.enums.DataTypeEnum;
import com.iailab.module.data.common.enums.JsErrorCode;
import com.iailab.module.data.common.utils.JavaScriptHandler;
+import com.iailab.module.data.point.collection.PointCollector;
import com.iailab.module.data.point.collection.utils.GenInfluxPointValueUtils;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.service.DaPointService;
@@ -10,6 +14,9 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -39,18 +46,22 @@
@Resource
private JavaScriptHandler javaScriptHandler;
- public static final String regex = "[+\\-\\*\\/\\(\\)\\&\\|\\>\\<]";
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
- public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap) {
+ public static final String regex = "[+\\-\\*/()\\&\\|\\>\\<]";
+
+ public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap,List<String> listGood,List<String> listBad) {
List<InfluxPointValuePOJO> result = new ArrayList<>();
try {
log.info("计算点处理开始");
if (CollectionUtils.isEmpty(dtos)) {
return result;
}
+ log.info(JSON.toJSONString(listBad));
dtos.forEach(dto -> {
try {
- Object value = singleCompute(dto, dataMap);
+ Object value = singleCompute(dto, dataMap, listGood, listBad);
InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
pojo.setTimestamp(collectTime.toInstant());
result.add(pojo);
@@ -68,14 +79,22 @@
return result;
}
- private Object singleCompute(DaPointDTO dto, Map<String, Object> dataMap) {
+ private Object singleCompute(DaPointDTO dto, Map<String, Object> dataMap,List<String> listGood,List<String> listBad) {
String expression = dto.getExpression();
+ log.info("PointNo=" + dto.getPointNo() + ";SourceExpression=" + expression);
String[] arr = expression.split(regex);
+ // 判断arr都在dataMap中包含
+ 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());
+ // 对每个数加（），否则负值报错
+ expression = expression.replace(s, "(" + dataMap.get(s).toString() + ")");
}
}
expression = expression.replace("&", "&&");
@@ -85,22 +104,24 @@
log.info("PointNo=" + dto.getPointNo() + ";expression=" + expression);
String result = javaScriptHandler.eval(expression);
log.info("result=" + result);
- if (result == null) {
- return null;
- } else if (result.contains(JsErrorCode.Infinity.name()) ||
- result.contains(JsErrorCode.NaN.name())) {
- log.info("计算异常，使用默认值");
- return dto.getDefaultValue() == null ? BigDecimal.ZERO : dto.getDefaultValue();
+ if (result == null || result.contains(JsErrorCode.Infinity.name()) || result.contains(JsErrorCode.NaN.name())) {
+ listBad.add(dto.getPointNo());
+ return CommonConstant.BAD_VALUE;
} else {
if (DataTypeEnum.INT.getCode().equals(dto.getDataType())) {
+ listGood.add(dto.getPointNo());
return new BigDecimal(result).intValue();
} else if (DataTypeEnum.FLOAT.getCode().equals(dto.getDataType())) {
- return new BigDecimal(result).setScale(10, BigDecimal.ROUND_UP).doubleValue();
+ listGood.add(dto.getPointNo());
+ return new BigDecimal(result).setScale(4, BigDecimal.ROUND_UP).doubleValue();
} else if (DataTypeEnum.BOOLEAN.getCode().equals(dto.getDataType())) {
+ listGood.add(dto.getPointNo());
return Boolean.parseBoolean(result);
+ } else {
+ listBad.add(dto.getPointNo());
+ throw new RuntimeException("计算异常，未知数据类型");
}
}
- return result;
}
public Map<String, Object> getCurrent(List<String> pointNos) {
@@ -110,12 +131,19 @@
return data;
}
pointMathList.forEach(item -> {
- data.put(item.getPointNo(), singleCompute(item));
+ Object value = CommonConstant.BAD_VALUE;
+ if (redisTemplate.hasKey(PointCollector.PV + item.getPointNo())) {
+ value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
+ } else {
+ value = singleCompute(item);
+ }
+ data.put(item.getPointNo(), value);
});
return data;
}
private Object singleCompute(DaPointDTO dto) {
+ String result = CommonConstant.BAD_VALUE.toString();
Map<String, Object> dataMap = new HashMap<>();
String expression = dto.getExpression();
String[] arr = expression.split(regex);
@@ -128,26 +156,37 @@
pointNos.add(s);
dataMap.putAll(measureHandle.getCurrent(pointNos));
dataMap.putAll(constantHandle.getCurrent(pointNos));
- expression = expression.replace(s, dataMap.get(s).toString());
+ if (dataMap.get(s) == null) {
+ log.info("计算点数据异常");
+ log.info("pointNo=" + dto.getPointNo() +";dataMap.key=" + s);
+ return CommonConstant.BAD_VALUE;
+ }
+ String valueStr = dataMap.get(s).toString();
+ if (StrUtils.isNumeric(valueStr) && new BigDecimal(valueStr).compareTo(CommonConstant.BAD_VALUE) == 0) {
+ log.info("BAD_VALUE:" + s);
+ }
+ if (StrUtils.isNumeric(valueStr) && new BigDecimal(valueStr).compareTo(BigDecimal.ZERO) < 0) {
+ valueStr = "(" + valueStr + ")";
+ }
+ expression = expression.replace(s, valueStr);
}
expression = expression.replace("&", "&&");
expression = expression.replace("|", "||");
expression = expression.replace("False", "false");
expression = expression.replace("True", "true");
log.info("PointNo=" + dto.getPointNo() + ";expression=" + expression);
- String result = javaScriptHandler.eval(expression);
+ result = javaScriptHandler.eval(expression);
log.info("result=" + result);
if (result == null) {
- return null;
- } else if (result.contains(JsErrorCode.Infinity.name()) ||
- result.contains(JsErrorCode.NaN.name())) {
+ return CommonConstant.BAD_VALUE;
+ } else if (result.contains(JsErrorCode.Infinity.name()) || result.contains(JsErrorCode.NaN.name())) {
log.info("计算异常，使用默认值");
return dto.getDefaultValue() == null ? BigDecimal.ZERO : dto.getDefaultValue();
} else {
if (DataTypeEnum.INT.getCode().equals(dto.getDataType())) {
return new BigDecimal(result).intValue();
} else if (DataTypeEnum.FLOAT.getCode().equals(dto.getDataType())) {
- return new BigDecimal(result).setScale(10, BigDecimal.ROUND_UP).doubleValue();
+ return new BigDecimal(result).setScale(2, BigDecimal.ROUND_UP).doubleValue();
} else if (DataTypeEnum.BOOLEAN.getCode().equals(dto.getDataType())) {
return Boolean.parseBoolean(result);
}
--
Gitblit v1.9.3