From 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 17 Nov 2022 09:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 5021c3e..ea2eb74 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
@@ -78,10 +78,10 @@
Object aqiValue = null;
if (aqiMap != null) {
//String jsonStr = JsonUtil.readJsonFile("classpath:SensorContrast.json");
- String jsonStr = JsonUtil.testReadFile("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(result.get(key));*/
+ aqiValue = aqiMap.get(SensorContrasts.sensorContrastMap.get(key));
}
env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat((String) aqiValue));
}
--
Gitblit v1.8.0