From b7f5fd4000d644d117a0936dbcc2bfc56bfab4f0 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:08:11 +0800
Subject: [PATCH] 新建特殊设备DTO类，存放保存到redis的数据
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
index 86f21fc..e8f0e91 100644
--- a/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java
@@ -9,6 +9,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import com.alibaba.fastjson.JSON;
import com.googlecode.aviator.AviatorEvaluator;
@@ -40,11 +41,14 @@
deviceData.put(key, measuredValue);
continue;
}
-
//���������������������������������
- DeviceAdjustValue deviceAdjustValue = sensorFormulas.stream()
+ DeviceAdjustValue deviceAdjustValue = new DeviceAdjustValue();
+ Optional<DeviceAdjustValue> optional = sensorFormulas.stream()
.filter(o -> o.getStartTime().getTime() <= finalTime && o.getEndTime().getTime() > finalTime)
- .findFirst().get();
+ .findFirst();
+ if (optional.isPresent()) {
+ deviceAdjustValue = optional.get();
+ }
String formula = deviceAdjustValue.getValue();
if (StringUtils.isEmpty(formula)) {
deviceData.put(key, measuredValue);
--
Gitblit v1.8.0