From f2cf93a2e2ac0c30ea4aa65f707a71fcee63f1c9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 05 Aug 2021 13:55:22 +0800
Subject: [PATCH] screen-manage 更改因子修改代码刷新缓存逻辑
---
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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..ed7bf99 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
@@ -14,18 +14,22 @@
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.get("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")) {
//���������
@@ -57,7 +61,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 +70,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