From d620e65b30db7bc43db71d26fbce36548819eebc Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 28 Dec 2021 09:42:19 +0800
Subject: [PATCH] 修改特殊设备更新接口
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..d1d059b 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;
@@ -23,7 +24,7 @@
/**
* @param deviceData ������������
* @param adjustFormula ������������
- * @param aqiMap ���������������������������������aqi������
+ * @param aqiMap ������������������������������aqi������
* @return Map<String, Object> ���������������
*/
public Map<String, Object> adjust(Map<String, Object> deviceData, Map<String, Object> adjustFormula, Map<String, Object> aqiMap) {
@@ -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);
@@ -78,7 +82,6 @@
}
} catch (Exception e) {
log.error("param[0] deviceData:" + JSON.toJSONString(deviceData));
- log.error(e.getMessage());
}
return deviceData;
}
--
Gitblit v1.8.0