From 707962b2002a90847b7d4839d9328e5b289512a4 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 22 Sep 2022 16:35:24 +0800
Subject: [PATCH] 大屏实时显示bug修改
---
screen-api/src/main/java/com/moral/api/utils/AdjustDataUtils.java | 3 ++-
screen-api/src/main/java/com/moral/api/utils/JsonUtil.java | 24 ++++++++++++++++++++----
2 files changed, 22 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 573420d..5021c3e 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
@@ -77,7 +77,8 @@
if (formula.contains("aqi")) {
Object aqiValue = null;
if (aqiMap != null) {
- String jsonStr = JsonUtil.readJsonFile("classpath: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(SensorContrasts.sensorContrastMap.get(key));
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
index 6cf2b65..7ec0dec 100644
--- a/screen-api/src/main/java/com/moral/api/utils/JsonUtil.java
+++ b/screen-api/src/main/java/com/moral/api/utils/JsonUtil.java
@@ -1,9 +1,9 @@
package com.moral.api.utils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import java.io.*;
public class JsonUtil {
@@ -31,5 +31,21 @@
}
}
+ public static String testReadFile(String filePath) throws IOException {
+// ClassPathResource classPathResource = new ClassPathResource("resource.properties");
+ String jsonStr = "";
+ Resource resource = new ClassPathResource(filePath);
+ InputStream is = resource.getInputStream();
+ Reader reader = new InputStreamReader(resource.getInputStream(), "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;
+ }
+
}
--
Gitblit v1.8.0