From 4da6ddeb728bb4649328aa652ffc1c56b0e81629 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Apr 2024 11:42:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index ccfb212..eafca70 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -686,7 +686,7 @@
Date now = new Date();
//������
- Date yesterday = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, 0), DateUtils.yyyy_MM_dd_EN);
+ Date yesterday = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), DateUtils.yyyy_MM_dd_EN);
String dateString = DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN);
String s = String.valueOf(regionCode);
@@ -1463,10 +1463,12 @@
}
}
if (value.size() < 6) {
+ map.put("time",times);
+ list.add(map);
continue;
}
double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
- map.put("O3", new BigDecimal(average).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+ map.put("O3", new BigDecimal(average).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue());
map.put("time",times);
list.add(map);
}
--
Gitblit v1.8.0