From 28923b3d67c58b032bc4ff128aa1d5e62d73dba1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Feb 2024 10:07:58 +0800
Subject: [PATCH] fix:提交实时在线率接口

---
 screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 573420d..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
@@ -9,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;
@@ -77,12 +78,14 @@
                     if (formula.contains("aqi")) {
                         Object aqiValue = null;
                         if (aqiMap != null) {
-                            String jsonStr = JsonUtil.readJsonFile("classpath:SensorContrast.json");
-                            JSONObject result = JSONObject.parseObject(jsonStr);
-                            aqiValue = aqiMap.get(result.get(key));
-                            //aqiValue = aqiMap.get(SensorContrasts.sensorContrastMap.get(key));
+                            //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