From 1f93887d0e1e327cf7a1dc644cb59b5f8cca1e88 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Oct 2022 13:57:42 +0800
Subject: [PATCH] 上传浑南区图表功能
---
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 3b2cd89..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,6 +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;
@@ -76,9 +77,11 @@
if (formula.contains("aqi")) {
Object aqiValue = null;
if (aqiMap != null) {
- String jsonStr = JsonUtil.readJsonFile("screen-api/src/main/resources/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(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