From 60cd6696e315bc4ee8ba5e8197e08bf7774df06c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 12 Oct 2022 14:28:12 +0800
Subject: [PATCH] 修改浑南区图表aqi计算方法
---
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 7 ++++---
1 files changed, 4 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 fd58b4c..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
@@ -77,10 +77,11 @@
if (formula.contains("aqi")) {
Object aqiValue = null;
if (aqiMap != null) {
- String jsonStr = JsonUtil.readJsonFile("classpath:json/SensorContrast.json");
+ //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(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