From 2fcc1a1b8f09a731af53247d0b5e88397649fb44 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期五, 10 一月 2025 17:50:44 +0800 Subject: [PATCH] 数据采集bug --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java | 28 ++++++++++++++++++---------- 1 files changed, 18 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 f140509..d97b8f7 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 @@ -50,7 +50,7 @@ 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("计算点处理开始"); @@ -59,7 +59,7 @@ } 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); @@ -77,14 +77,20 @@ 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(); String[] arr = expression.split(regex); + // 判断arr都在dataMap中包含 + if (!Arrays.stream(arr).allMatch(dataMap::containsKey)) { + 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 +100,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) { -- Gitblit v1.9.3