From 6cc2a1d726e1019079b6d3fa74599426a359c001 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 14:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-common/src/main/java/com/moral/util/AQIUtils.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/AQIUtils.java b/screen-common/src/main/java/com/moral/util/AQIUtils.java
index 592eadc..a55c8f5 100644
--- a/screen-common/src/main/java/com/moral/util/AQIUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AQIUtils.java
@@ -59,7 +59,7 @@
}
/**
- * @Description: ������AQI���������������
+ * @Description: ������AQI������������������map���key���sensorCode���value���������
* @Param: [map]
* @return: java.util.Map<java.lang.String,java.lang.Object>
* @Author: ���������
@@ -126,10 +126,22 @@
}
Map<String,Object> resultMap = new HashMap<>();
resultMap.put("aqi",AQIMAX);
- resultMap.put("pollutant",nameList);
+ if(AQIMAX>50)
+ resultMap.put("pollutant",nameList);
return resultMap;
}
+ public static void main(String[] args) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("a34004",11.25);
+ map.put("a34002",18.25);
+ map.put("a21026",55);
+ map.put("a21004",200.01);
+ map.put("a21005",18.94);
+ map.put("a05024",55);
+ System.out.println(hourlyAqi_pollutant(map));
+ }
+
/**
* @Description: ������AQI������������
* @Param:
--
Gitblit v1.8.0