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 | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 1f1deba..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,25 +9,30 @@
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;
import com.googlecode.aviator.Expression;
import com.moral.api.entity.DeviceAdjustValue;
+import com.moral.constant.Constants;
import com.moral.util.DateUtils;
@Slf4j
@Component
public class AdjustDataUtils {
- //���������������
+ /**
+ * @param deviceData ������������
+ * @param adjustFormula ������������
+ * @param aqiMap ���������������������������������aqi������
+ * @return Map<String, Object> ���������������
+ */
public Map<String, Object> adjust(Map<String, Object> deviceData, Map<String, Object> adjustFormula, Map<String, Object> aqiMap) {
try {
- Object dataTime = deviceData.get("DataTime");
- //���������������������������
- long time = Math.round(new Double((String) dataTime) / 1000) * 1000L;
- long finalTime = DateUtils.dataToTimeStampTime(new Date(time), DateUtils.HH_mm_ss_EN).getTime();
+ Date time = DateUtils.getDate((String) deviceData.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+ long finalTime = DateUtils.dataToTimeStampTime(time, DateUtils.HH_mm_ss_EN).getTime();
for (String key : deviceData.keySet()) {
- if (!key.equals("mac") && !key.equals("time") && !key.equals("DataTime") && !key.equals("ver") && !key.contains("Flag")) {
+ if (!key.contains("Flag")) {
//���������
Object measuredValue = deviceData.get(key);
//������������������������
@@ -36,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);
@@ -57,7 +65,7 @@
env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat((String) aqiValue));
}
if (formula.contains("vocs")) {
- Object vocsValue = ObjectUtils.isEmpty(deviceData.get("a99054")) ? 0F : deviceData.get("a99054");
+ Object vocsValue = ObjectUtils.isEmpty(deviceData.get(Constants.SENSOR_CODE_VOCS)) ? 0F : deviceData.get(Constants.SENSOR_CODE_VOCS);
env.put("vocs", vocsValue);
}
if (formula.contains("cel")) {
@@ -66,10 +74,10 @@
//������
measuredValue = expression.execute(env);
//������������
- if (Float.parseFloat(measuredValue.toString()) < 0 && !"a01001".equals(measuredValue)) {
+ if (!Constants.SENSOR_CODE_TEMP.equals(measuredValue) && Float.parseFloat(measuredValue.toString()) < 0) {
measuredValue = 0F;
}
- deviceData.put(key, Double.parseDouble(String.format("%.3f", measuredValue)));
+ deviceData.put(key, Double.parseDouble(String.format("%.4f", measuredValue)));
}
}
} catch (Exception e) {
--
Gitblit v1.8.0