From 36203a854c6d1958549ebf65ba234561ab5271b5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 26 Sep 2022 10:58:17 +0800
Subject: [PATCH] 添加空气质量报告功能
---
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 8 +++++++-
1 files changed, 7 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..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
@@ -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;
@@ -75,7 +77,11 @@
if (formula.contains("aqi")) {
Object aqiValue = null;
if (aqiMap != null) {
- aqiValue = aqiMap.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));
}
env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat((String) aqiValue));
}
--
Gitblit v1.8.0