From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java b/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
index ae30e5c..8c9bc04 100644
--- a/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
+++ b/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
@@ -172,12 +172,12 @@
public static Double dailyData(Map<String, Object> data) {
if (data == null)
return null;
- Double CPM25 = Double.parseDouble(data.get("pm2_5").toString());
- Double CPM10 = Double.parseDouble(data.get("pm10").toString());
- Double CSO2 = Double.parseDouble(data.get("so2").toString());
- Double CNO2 = Double.parseDouble(data.get("no2").toString());
- Double CCO = Double.parseDouble(data.get("co").toString());
- Object o3 = data.get("o3");
+ Double CPM25 = Double.parseDouble(data.get("PM2_5").toString());
+ Double CPM10 = Double.parseDouble(data.get("PM10").toString());
+ Double CSO2 = Double.parseDouble(data.get("SO2").toString());
+ Double CNO2 = Double.parseDouble(data.get("NO2").toString());
+ Double CCO = Double.parseDouble(data.get("CO").toString());
+ Object o3 = data.get("O3");
Double CO3 = null;
if (!ObjectUtils.isEmpty(o3)) {
CO3 = Double.parseDouble(o3.toString());
@@ -214,4 +214,5 @@
return comprehensiveIndex;
}
+
}
--
Gitblit v1.8.0