From e94e5dbbfc544c558a09fb388e7f4d4341fe8ec4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 16:59:01 +0800
Subject: [PATCH] ci:添加自有权限
---
screen-common/src/main/java/com/moral/util/AmendUtils.java | 81 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 4218796..3c726b1 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -53,7 +53,7 @@
Object lower = params.get("o3Lower");
double max;
List<Double> avgs = new ArrayList<>();
- for (int i = 8; i <= 24; i++) {
+ for (int i = 7; i <= 23; i++) {
List<Double> data = new ArrayList<>();
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
@@ -79,9 +79,6 @@
}
int hour = DateUtils.getHour((Date) dataMap.get("time"));
- if (hour == 0) {
- hour = 24;
- }
if (hour <= i && hour >= i - 7) {
data.add(o3);
}
@@ -108,7 +105,7 @@
if (!ObjectUtils.isEmpty(o3_8H)) {
double o3 = 0d;
for (Map<String, Object> o : o3_8H) {
- double temp = (double) o.get("o3");
+ double temp = (double) o.get("O3");
if (temp > o3) {
o3 = temp;
}
@@ -123,34 +120,17 @@
* @return ���������������8���������������������
*/
public static List<Map<String, Object>> getO3_8H(List<Map<String, Object>> data) {
- Date time1 = null;
- Date time2 = null;
- for (Map<String, Object> datum : data) {
- Date time = (Date) datum.get("time");
- if (DateUtils.getHour(time) == 0) {
- time2 = DateUtils.getDate(DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_EN));
- } else {
- time1 = DateUtils.getDate(DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_EN));
- }
- }
-
+ Date date = (Date) data.get(0).get("time");
List<Map<String, Object>> result = new ArrayList<>();
- for (int i = 8; i <= 24; i++) {
+ for (int i = 7; i <= 23; i++) {
Map<String, Object> map = new HashMap<>();
- if (i < 24) {
- map.put("time", ObjectUtils.isEmpty(time1) ? null : DateUtils.addHours(time1, i));
- } else {
- map.put("time", ObjectUtils.isEmpty(time2) ? null : time2);
- }
+ map.put("time", DateUtils.addHours(date, i));
List<Double> value = new ArrayList<>();
for (Map<String, Object> dataMap : data) {
Map<String, Object> sensorValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
- Double o3 = Double.parseDouble(sensorValue.get("o3").toString());
+ Double o3 = Double.parseDouble(sensorValue.get("O3").toString());
Date time = (Date) dataMap.get("time");
int hour = DateUtils.getHour(time);
- if (hour == 0) {
- hour = 24;
- }
if (hour <= i && hour >= i - 7) {
value.add(o3);
}
@@ -159,7 +139,7 @@
continue;
}
double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
- map.put("o3", average);
+ map.put("O3", sciCal(average, 0));
result.add(map);
}
return result;
@@ -269,15 +249,12 @@
public static double percentile(List<Double> data, int p) {
int n = data.size();
Collections.sort(data);
- double v = n / (100 / p);
- if (n % (100 / p) == 0) {
- if (v == n) {
- return data.get(n - 1);
- }
- return (data.get((int) v - 1) + data.get((int) v)) / 2;
- }
+ double v = MathUtils.division(MathUtils.mul(n, p),100d,1);
+ v = Math.ceil(v)-1;
return sciCal(data.get((int) v), 4);
}
+
+
//������������������������������
public static Map<String, Object> getCOAvgOfWeekOrMonth(Map<String, Object> params) {
@@ -347,4 +324,40 @@
result.put(Constants.SENSOR_CODE_O3, percentile(data, 90));
return result;
}
+
+ //������������������������
+ /**
+ * ���������������
+ * PM2.5,PM10,CO,���������95���������
+ * SO2,NO2,���������98���������
+ * O3���������������90���������
+ *
+ * @param list ������
+ * @param sensorCode ������code
+ */
+ public static Double getAvgOfYear(List<Map<String, Object>> list, String sensorCode) {
+ List<Double> data = new ArrayList<>();
+ for (Map<String, Object> dataMap : list) {
+ Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
+ Object o = dataValue.get(sensorCode);
+ if (ObjectUtils.isEmpty(o)) {
+ continue;
+ }
+ Double sensorValue = Double.parseDouble(o.toString());
+ data.add(sensorValue);
+ }
+ if (data.size() == 0) {
+ return null;
+ }
+
+ Double v = null;
+ if ("PM2_5".equals(sensorCode) || "PM10".equals(sensorCode) || "CO".equals(sensorCode)) {
+ v = percentile(data, 95);
+ } else if ("SO2".equals(sensorCode) || "NO2".equals(sensorCode)) {
+ v = percentile(data, 98);
+ } else if ("O3".equals(sensorCode)) {
+ v = percentile(data, 90);
+ }
+ return v;
+ }
}
--
Gitblit v1.8.0