From 6e0d1d51916e4f41e06c06e984a70ebd08352d95 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 26 六月 2025 09:35:49 +0800
Subject: [PATCH] 打包加密jar包配置
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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 f161e28..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;
@@ -16,6 +17,7 @@
import org.apache.commons.lang3.StringUtils;
import javax.annotation.Resource;
+import javax.validation.constraints.Max;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -61,9 +63,11 @@
public final static String regex = "[+\\-\\*/()\\&\\|\\>\\<]";
- private final static String POINT_PREFIX = "M";
+ private final static String POINT_PREFIX = "C";
private final static String PENDING_FLAG = "pending";
+
+ private final static int MAX_RECURSION = 10;
public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap, List<String> listGood, List<String> listBad) {
List<InfluxPointValuePOJO> result = new ArrayList<>();
@@ -124,7 +128,7 @@
}
log.info("处理包含计算点的");
log.info("handPending count=" + count);
- if (count > 10) {
+ if (count > MAX_RECURSION) {
log.info("最多递归10次");
return;
}
@@ -158,17 +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.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("&", "&&");
@@ -176,10 +188,6 @@
expression = expression.replace("False", "false");
expression = expression.replace("True", "true");
log.info("PointNo=" + dto.getPointNo() + ";expression=" + expression);
- if(expression.contains(POINT_PREFIX)) {
- // 包含计算点，先挂起
- return PENDING_FLAG;
- }
String result = javaScriptHandler.eval(expression);
log.info("result=" + result);
@@ -214,7 +222,7 @@
if (redisTemplate.hasKey(PointCollector.PV + item.getPointNo())) {
value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
} else {
- Object rawValue = singleCompute(item);
+ Object rawValue = singleCompute(item, 1);
BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor();
value = new BigDecimal(rawValue.toString()).multiply(coefficient);
}
@@ -223,7 +231,7 @@
return data;
}
- private Object singleCompute(DaPointDTO dto) {
+ private Object singleCompute(DaPointDTO dto, int count) {
String result = CommonConstant.BAD_VALUE.toString();
Map<String, Object> dataMap = new HashMap<>();
String expression = dto.getExpression();
@@ -239,6 +247,20 @@
dataMap.putAll(constantHandle.getCurrent(pointNos));
dataMap.putAll(cumulateHandle.getCurrent(pointNos));
dataMap.putAll(extremalHandle.getCurrent(pointNos));
+ if (s.trim().startsWith(POINT_PREFIX)) {
+ log.info("计算点递归查询");
+ List<DaPointDTO> pointMathList = daPointService.getMathPoint(pointNos);
+ if (CollectionUtils.isEmpty(pointMathList)) {
+ return result;
+ }
+ log.info("count = " + count);
+ if (count > MAX_RECURSION) {
+ return result;
+ }
+ Object v = this.singleCompute(pointMathList.get(0), count);
+ dataMap.put(s, v);
+ count = count + 1;
+ }
if (dataMap.get(s) == null) {
log.info("计算点数据异常");
log.info("pointNo=" + dto.getPointNo() + ";dataMap.key=" + s);
--
Gitblit v1.9.3