From 28776b56db3bbd2fbbfd64394e40aa11a6b7ea29 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 17:30:53 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java b/screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java
index 81faef4..3a8da4e 100644
--- a/screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java
+++ b/screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java
@@ -1,5 +1,7 @@
package com.moral.api.utils;
+import com.alibaba.fastjson.JSONObject;
+import com.moral.constant.SensorContrasts;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
@@ -7,6 +9,7 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -75,9 +78,14 @@
if (formula.contains("aqi")) {
Object aqiValue = null;
if (aqiMap != null) {
+ //String jsonStr = JsonUtil.readJsonFile("classpath:SensorContrast.json");
+// String jsonStr = JsonUtil.testReadFile("SensorContrast.json");
+// JSONObject result = JSONObject.parseObject(jsonStr);
+// aqiValue = aqiMap.get(result.get(key));
+// aqiValue = aqiMap.get(SensorContrasts.sensorContrastMap.get(key));
aqiValue = aqiMap.get(key);
}
- env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat((String) aqiValue));
+ env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat(String.valueOf(aqiValue)));
}
if (formula.contains("vocs")) {
Object vocsValue = ObjectUtils.isEmpty(deviceData.get(Constants.SENSOR_CODE_VOCS)) ? 0F : deviceData.get(Constants.SENSOR_CODE_VOCS);
--
Gitblit v1.8.0