From f8bfd26b5ca75f439c74ecc1a830ccfbdcc11b63 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 24 Jul 2023 09:42:19 +0800
Subject: [PATCH] fix: 导出数据添加百分位
---
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 ea2eb74..3a8da4e 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
@@ -9,6 +9,7 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -78,12 +79,13 @@
Object aqiValue = null;
if (aqiMap != null) {
//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));
+// 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(key);
}
- env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat((String) aqiValue));
+ env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat(String.valueOf(aqiValue)));
}
if (formula.contains("vocs")) {
Object vocsValue = ObjectUtils.isEmpty(deviceData.get(Constants.SENSOR_CODE_VOCS)) ? 0F : deviceData.get(Constants.SENSOR_CODE_VOCS);
--
Gitblit v1.8.0