From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +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 | 5 +++++
1 files changed, 5 insertions(+), 0 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 d97b8f7..66dc01f 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
@@ -152,6 +152,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