From d5c1061180b0a6867857b7eef3b7cd6d35ef7f7c Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 22 Sep 2022 15:04:11 +0800
Subject: [PATCH] 大屏实时显示bug修改
---
screen-api/src/main/resources/SensorContrast.json | 8 ++++++++
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 5 ++++-
screen-api/src/main/java/com/moral/api/utils/JsonUtil.java | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 47 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..3b2cd89 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,6 @@
package com.moral.api.utils;
+import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
@@ -75,7 +76,9 @@
if (formula.contains("aqi")) {
Object aqiValue = null;
if (aqiMap != null) {
- aqiValue = aqiMap.get(key);
+ String jsonStr = JsonUtil.readJsonFile("screen-api/src/main/resources/SensorContrast.json");
+ JSONObject result = JSONObject.parseObject(jsonStr);
+ aqiValue = aqiMap.get(result.get(key));
}
env.put("aqi", ObjectUtils.isEmpty(aqiValue) ? 0F : Float.parseFloat((String) aqiValue));
}
diff --git a/screen-api/src/main/java/com/moral/api/utils/JsonUtil.java b/screen-api/src/main/java/com/moral/api/utils/JsonUtil.java
new file mode 100644
index 0000000..6cf2b65
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/utils/JsonUtil.java
@@ -0,0 +1,35 @@
+package com.moral.api.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+public class JsonUtil {
+
+ /**
+ * ������JSON������������������������
+ * @param filePath
+ * @return
+ */
+ public static String readJsonFile(String filePath) {
+ String jsonStr = "";
+ try {
+ File jsonFile = new File(filePath);
+ Reader reader = new InputStreamReader(new FileInputStream(jsonFile), "utf-8");
+ int ch = 0;
+ StringBuffer sb = new StringBuffer();
+ while ((ch = reader.read()) != -1) {
+ sb.append((char) ch);
+ }
+ reader.close();
+ jsonStr = sb.toString();
+ return jsonStr;
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ return null;
+ }
+ }
+
+}
+
diff --git a/screen-api/src/main/resources/SensorContrast.json b/screen-api/src/main/resources/SensorContrast.json
new file mode 100644
index 0000000..5045839
--- /dev/null
+++ b/screen-api/src/main/resources/SensorContrast.json
@@ -0,0 +1,8 @@
+{
+ "a34004": "PM2_5",
+ "a34002": "PM10",
+ "a05024": "O3",
+ "a21004": "NO2",
+ "a21005": "CO",
+ "a21026": "SO2"
+}
\ No newline at end of file
--
Gitblit v1.8.0