From 3f49e5966a3dfcf219171a435696338df8f85f31 Mon Sep 17 00:00:00 2001 From: chen_xi <276999030@qq.com> Date: Wed, 19 Oct 2022 11:17:26 +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