From dbd8a0de4b94f846a6beeccfaca3ed5cc08b0b9e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 28 二月 2025 13:33:57 +0800
Subject: [PATCH] 计算点增加单位转换

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 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 f140509..014e6cd 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,5 +1,6 @@
 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;
@@ -21,6 +22,8 @@
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 计算点处理
@@ -50,17 +53,20 @@
 
     public static final String regex = "[+\\-\\*/()\\&\\|\\>\\<]";
 
-    public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap) {
+    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);
-                    InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value);
+                    Object rawValue = singleCompute(dto, dataMap, listGood, listBad);
+                    BigDecimal coefficient = dto.getUnittransfactor() == null ? BigDecimal.ONE : dto.getUnittransfactor();
+                    BigDecimal calValue = new BigDecimal(rawValue.toString()).multiply(coefficient);
+                    InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, calValue);
                     pojo.setTimestamp(collectTime.toInstant());
                     result.add(pojo);
                 } catch (Exception ex) {
@@ -77,14 +83,24 @@
         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中的空格
+        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");
+            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("&", "&&");
@@ -94,22 +110,24 @@
         log.info("PointNo=" + dto.getPointNo() + ";expression=" + expression);
         String result = javaScriptHandler.eval(expression);
         log.info("result=" + result);
-        if (result == null) {
+        if (result == null || result.contains(JsErrorCode.Infinity.name()) || result.contains(JsErrorCode.NaN.name())) {
+            listBad.add(dto.getPointNo());
             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())) {
+                listGood.add(dto.getPointNo());
                 return new BigDecimal(result).intValue();
             } else if (DataTypeEnum.FLOAT.getCode().equals(dto.getDataType())) {
+                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) {
@@ -123,7 +141,9 @@
             if (redisTemplate.hasKey(PointCollector.PV + item.getPointNo())) {
                 value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo());
             } else {
-                value = singleCompute(item);
+                Object rawValue = singleCompute(item);
+                BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor();
+                value = new BigDecimal(rawValue.toString()).multiply(coefficient);
             }
             data.put(item.getPointNo(), value);
         });
@@ -144,6 +164,11 @@
             pointNos.add(s);
             dataMap.putAll(measureHandle.getCurrent(pointNos));
             dataMap.putAll(constantHandle.getCurrent(pointNos));
+            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);

--
Gitblit v1.9.3