From eba6f1988c6a7e37e619a27e493b17c244979070 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 30 Sep 2021 16:11:29 +0800
Subject: [PATCH] screen-aqi 完成获取监测站数据接口
---
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 9f9b368..638c261 100644
--- a/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
+++ b/screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java
@@ -45,12 +45,13 @@
Double ICO = CCO / SCO;
Double IO3 = CO3 / SO3;
//������������������
- Double ComprehensiveIndex = MathUtils.add(ISO2,INO2);
- ComprehensiveIndex = MathUtils.add(ComprehensiveIndex,IPM25);
- ComprehensiveIndex = MathUtils.add(ComprehensiveIndex,IPM10);
- ComprehensiveIndex = MathUtils.add(ComprehensiveIndex,ICO);
- ComprehensiveIndex = MathUtils.add(ComprehensiveIndex,IO3);
- return ComprehensiveIndex;
+ Double comprehensiveIndex = MathUtils.add(ISO2,INO2);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex,IPM25);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex,IPM10);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex,ICO);
+ comprehensiveIndex = MathUtils.add(comprehensiveIndex,IO3);
+ comprehensiveIndex = AmendUtils.sciCal(comprehensiveIndex,2);
+ return comprehensiveIndex;
}
/**
--
Gitblit v1.8.0