From e414c2eb234515e07e4f041e1dc80c7589fbf41a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 21 Jul 2023 15:51:51 +0800
Subject: [PATCH] fix: 导出数据均值多算0
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 3632a25..e0df6e8 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -266,7 +266,7 @@
if(map.containsKey(k)){
Object o = map.get(k).get(sensor);
timeValueMap.put(c,Objects.nonNull(o)?Double.valueOf(o.toString()):0);
- if(Objects.nonNull(o)){
+ if(Objects.nonNull(o)&& (!Double.valueOf(o.toString()).equals(0d))){
doubleArrayList.add(Double.valueOf(o.toString()));
}
}else {
@@ -395,7 +395,7 @@
if(map.containsKey(k)){
Object o = map.get(k).get(sensor);
num = Objects.nonNull(o)?Double.valueOf(o.toString()):0d;
- if(Objects.nonNull(num)){
+ if(Objects.nonNull(num)&& !num.equals(0d)){
ArrayList<Double> doubleArrayList = Objects.isNull(listMap.get(numCount+"_"+sensorMap.get(sensor)))?new ArrayList<>():listMap.get(numCount+"_"+sensorMap.get(sensor));
doubleArrayList.add(num);
listMap.put(numCount+"_"+sensorMap.get(sensor),doubleArrayList);
--
Gitblit v1.8.0